tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Adding release tag 

-----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEG+FaXQip1ZWVgUdrFDesAvc/kaIFAl/Z1mQACgkQFDesAvc/
 kaJbyAf9FFXOhw6e5u9iba3dxyvtrEEwufS4u/X2uwXJht9zMMg+FnlHr9hAokVd
 0VhX6hDhxOGRlA0NwslHrdvXzCYIByEkjjE/D+rpAXbdyvH6e+d/+in3rfyUvddd
 /BTzCvYraX8BykzbUfGHDXadmDIM4/ZTilvoAUcI31FtVd0peob+LwEQZluKciyb
 0wB53jCO7Teqf9crC7trDTDHZ31Xv0qm2V+whPbq+uahkNLA1fPpcvKxy1uOTMyA
 lTmhaikqo9QIqJ0riYDPPClLDTzsuAOwUgeaspw9csQViVDzvYtlFTk2Fwj6CCCF
 z4OTWGa1xZqwtazYweJ77JB5S2cfHQ==
 =kgjs
 -----END PGP SIGNATURE-----

Merge tag 'release_9.4.3' into emacs-sync
This commit is contained in:
Kyle Meyer 2020-12-16 09:43:44 -05:00
parent c5471c2d66 86af7e0c2f
commit 9edff03529
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/lisp/org-mac-link.el
View File

@ -912,7 +912,7 @@ selected items in DEVONthink Pro Office and make link(s) out of it/them."
"Visit the message with MESSAGE-ID.
This will use the command `open' with the message URL."
(start-process (concat "open message:" message-id) nil
"open" (concat "message://<" (substring message-id 2) ">")))
"open" (concat "message://%3C" (substring message-id 2) "%3E")))
(defun org-as-get-selected-mail ()
"AppleScript to create links to selected messages in Mail.app."

14
doc/org-manual.org
View File

@ -3516,12 +3516,11 @@ replacement text. Here is an example:
#+begin_src emacs-lisp
(setq org-link-abbrev-alist
'(("bugzilla" . "http://10.1.2.9/bugzilla/show_bug.cgi?id=")
("url-to-ja" . "http://translate.google.fr/translate?sl=en&tl=ja&u=%h")
("google" . "http://www.google.com/search?q=")
("gmap" . "http://maps.google.com/maps?q=%s")
("omap" . "http://nominatim.openstreetmap.org/search?q=%s&polygon=1")
("ads" . "https://ui.adsabs.harvard.edu/search/q=%20author%3A\"%s\"")))
'(("bugzilla" . "http://10.1.2.9/bugzilla/show_bug.cgi?id=")
("Nu Html Checker" . "https://validator.w3.org/nu/?doc=%h")
("duckduckgo" . "https://duckduckgo.com/?q=%s")
("omap" . "http://nominatim.openstreetmap.org/search?q=%s&polygon=1")
("ads" . "https://ui.adsabs.harvard.edu/search/q=%20author%3A\"%s\"")))
#+end_src
If the replacement text contains the string =%s=, it is replaced with
@ -17284,8 +17283,7 @@ A note of warning: when =cache= is used in a session, caching may
cause unexpected results.
When the caching mechanism tests for any source code changes, it does
not expand noweb style references (see [[*Noweb Reference Syntax]]). For
reasons why, see https://orgmode.org/list/86fvqqc8jb.fsf@somewhere.org
not expand noweb style references (see [[*Noweb Reference Syntax]]).
The =cache= header argument can have one of two values: =yes= or =no=.

10
lisp/org-macs.el
View File

@ -461,9 +461,15 @@ is selected, only the bare key is returned."
;; Display UI and let user select an entry or
;; a sub-level prefix.
(goto-char (point-min))
(unless (pos-visible-in-window-p (point-max))
(org-fit-window-to-buffer))
(setq header-line-format nil)
(org-fit-window-to-buffer)
(unless (pos-visible-in-window-p (1- (point-max)))
(setq header-line-format "Use C-n, C-p or C-v to navigate.")
(setq allowed-keys (append allowed-keys '("\C-n" "\C-p" "\C-v"))))
(let ((pressed (org--mks-read-key allowed-keys prompt)))
(while (and (member pressed '("\C-n" "\C-p" "\C-v")))
(org-scroll (string-to-char pressed))
(setq pressed (org--mks-read-key allowed-keys prompt)))
(setq current (concat current pressed))
(cond
((equal pressed "\C-g") (user-error "Abort"))

6
lisp/org.el
View File

@ -8,7 +8,7 @@
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: https://orgmode.org
;; Version: 9.4.2
;; Version: 9.4.3
;; This file is part of GNU Emacs.
;;
@ -21214,8 +21214,4 @@ Started from `gnus-info-find-node'."
(run-hooks 'org-load-hook)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org.el ends here

2
lisp/ox-html.el
View File

@ -300,7 +300,7 @@ property on the headline itself.")
padding: 3px;
border: 1px solid black;
}
pre.src:hover:before { display: inline;}
pre.src:hover:before { display: inline; margin-top: 14px;}
/* Languages per Org manual */
pre.src-asymptote:before { content: 'Asymptote'; }
pre.src-awk:before { content: 'Awk'; }