summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@gnu.org>2020-12-16 19:17:58 +0100
committerBastien Guerry <bzg@gnu.org>2020-12-16 19:17:58 +0100
commit7cacf5da47d1f88bbaef07e10841d1f6bfe2e471 (patch)
tree3cf69b4687ff303e7126a45d12498a3dbe700002
parentee6c702e1895d88ee7e6f57bc6778694239ead76 (diff)
downloademacs-7cacf5da47d1f88bbaef07e10841d1f6bfe2e471.tar.gz
Update to Org 9.4.3
Fix #45259
-rw-r--r--doc/misc/org.texi14
-rw-r--r--lisp/org/org-macs.el10
-rw-r--r--lisp/org/org-version.el4
-rw-r--r--lisp/org/org.el6
-rw-r--r--lisp/org/ox-html.el2
5 files changed, 18 insertions, 18 deletions
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 29713f18bc2..7766b300c4f 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -4050,12 +4050,11 @@ replacement text. Here is an example:
@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 lisp
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.
When the caching mechanism tests for any source code changes, it does
-not expand noweb style references (see @ref{Noweb Reference Syntax}). For
-reasons why, see @uref{https://orgmode.org/list/86fvqqc8jb.fsf@@somewhere.org}
+not expand noweb style references (see @ref{Noweb Reference Syntax}).
The @samp{cache} header argument can have one of two values: @samp{yes} or @samp{no}.
diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el
index f375c33d96a..506fba8aaf5 100644
--- a/lisp/org/org-macs.el
+++ b/lisp/org/org-macs.el
@@ -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"))
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index 738dbd663c1..479ca460852 100644
--- a/lisp/org/org-version.el
+++ b/lisp/org/org-version.el
@@ -5,13 +5,13 @@
(defun org-release ()
"The release version of Org.
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))
;;;###autoload
(defun org-git-version ()
"The Git version of Org mode.
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))
(provide 'org-version)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 063d0449d29..1f7e434cefd 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -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
diff --git a/lisp/org/ox-html.el b/lisp/org/ox-html.el
index d2f24f5c6e4..1a466fb162b 100644
--- a/lisp/org/ox-html.el
+++ b/lisp/org/ox-html.el
@@ -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'; }