diff options
author | Bastien Guerry <bzg@gnu.org> | 2020-12-16 19:17:58 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@gnu.org> | 2020-12-16 19:17:58 +0100 |
commit | 7cacf5da47d1f88bbaef07e10841d1f6bfe2e471 (patch) | |
tree | 3cf69b4687ff303e7126a45d12498a3dbe700002 /lisp/org | |
parent | ee6c702e1895d88ee7e6f57bc6778694239ead76 (diff) | |
download | emacs-7cacf5da47d1f88bbaef07e10841d1f6bfe2e471.tar.gz |
Update to Org 9.4.3
Fix #45259
Diffstat (limited to 'lisp/org')
-rw-r--r-- | lisp/org/org-macs.el | 10 | ||||
-rw-r--r-- | lisp/org/org-version.el | 4 | ||||
-rw-r--r-- | lisp/org/org.el | 6 | ||||
-rw-r--r-- | lisp/org/ox-html.el | 2 |
4 files changed, 12 insertions, 10 deletions
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'; } |