mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-05-02 19:21:06 -07:00
Code Issues Projects Releases Wiki Activity

Update to Org 9.4.3

Browse source 
Fix #45259
This commit is contained in:
Bastien Guerry 2020-12-16 19:17:58 +01:00
parent ee6c702e18
commit 7cacf5da47
5 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
doc/misc/org.texi
View file

@ -4050,12 +4050,11 @@ replacement text. Here is an example:
@lisp @lisp
(setq org-link-abbrev-alist (setq org-link-abbrev-alist
'(("bugzilla" . "http://10.1.2.9/bugzilla/show_bug.cgi?id=") '(("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") ("Nu Html Checker" . "https://validator.w3.org/nu/?doc=%h")
("google" . "http://www.google.com/search?q=") ("duckduckgo" . "https://duckduckgo.com/?q=%s")
("gmap" . "http://maps.google.com/maps?q=%s") ("omap" . "http://nominatim.openstreetmap.org/search?q=%s&polygon=1")
("omap" . "http://nominatim.openstreetmap.org/search?q=%s&polygon=1") ("ads" . "https://ui.adsabs.harvard.edu/search/q=%20author%3A\"%s\"")))
("ads" . "https://ui.adsabs.harvard.edu/search/q=%20author%3A\"%s\"")))
@end lisp @end lisp
If the replacement text contains the string @samp{%s}, it is replaced with If the replacement text contains the string @samp{%s}, it is replaced with
@ -18285,8 +18284,7 @@ A note of warning: when @samp{cache} is used in a session, caching may
cause unexpected results. cause unexpected results.
When the caching mechanism tests for any source code changes, it does When the caching mechanism tests for any source code changes, it does
not expand noweb style references (see @ref{Noweb Reference Syntax}). For not expand noweb style references (see @ref{Noweb Reference Syntax}).
reasons why, see @uref{https://orgmode.org/list/86fvqqc8jb.fsf@@somewhere.org}
The @samp{cache} header argument can have one of two values: @samp{yes} or @samp{no}. The @samp{cache} header argument can have one of two values: @samp{yes} or @samp{no}.

10
lisp/org/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 ;; Display UI and let user select an entry or
;; a sub-level prefix. ;; a sub-level prefix.
(goto-char (point-min)) (goto-char (point-min))
(unless (pos-visible-in-window-p (point-max)) (setq header-line-format nil)
(org-fit-window-to-buffer)) (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))) (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)) (setq current (concat current pressed))
(cond (cond
((equal pressed "\C-g") (user-error "Abort")) ((equal pressed "\C-g") (user-error "Abort"))

4
lisp/org/org-version.el
View file

@ -5,13 +5,13 @@
(defun org-release () (defun org-release ()
"The release version of Org. "The release version of Org.
Inserted by installing Org mode or when a release is made." Inserted by installing Org mode or when a release is made."
(let ((org-release "9.4.2")) (let ((org-release "9.4.3"))
org-release)) org-release))
;;;###autoload ;;;###autoload
(defun org-git-version () (defun org-git-version ()
"The Git version of Org mode. "The Git version of Org mode.
Inserted by installing Org or when a release is made." Inserted by installing Org or when a release is made."
(let ((org-git-version "release_9.4.2")) (let ((org-git-version "release_9.4.3"))
org-git-version)) org-git-version))
(provide 'org-version) (provide 'org-version)

6
lisp/org/org.el
View file

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

2
lisp/org/ox-html.el
View file

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