[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org 69760ae 4/8: Merge branch 'maint'
From: |
Stefan Monnier |
Subject: |
[elpa] externals/org 69760ae 4/8: Merge branch 'maint' |
Date: |
Thu, 17 Dec 2020 18:39:46 -0500 (EST) |
branch: externals/org
commit 69760ae2e4838f4a462f51b7bfc4039be9592cff
Merge: baf1e7a 6ec2bb0
Author: Marco Wahl <marcowahlsoft@gmail.com>
Commit: Marco Wahl <marcowahlsoft@gmail.com>
Merge branch 'maint'
---
lisp/org-macs.el | 41 +++++++++++++++++++++++------------------
1 file changed, 23 insertions(+), 18 deletions(-)
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index 506fba8..d397e3e 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -377,18 +377,25 @@ error when the user input is empty."
'org-time-stamp-inactive)
(apply #'completing-read args)))
-(defun org--mks-read-key (allowed-keys prompt)
+(defun org--mks-read-key (allowed-keys prompt navigation-keys)
"Read a key and ensure it is a member of ALLOWED-KEYS.
+Enable keys to scroll the window if NAVIGATION-KEYS is set.
TAB, SPC and RET are treated equivalently."
- (let* ((key (char-to-string
- (pcase (read-char-exclusive prompt)
- ((or ?\s ?\t ?\r) ?\t)
- (char char)))))
- (if (member key allowed-keys)
- key
- (message "Invalid key: `%s'" key)
- (sit-for 1)
- (org--mks-read-key allowed-keys prompt))))
+ (setq header-line-format (when navigation-keys "Use C-n, C-p, C-v, M-v to
navigate."))
+ (let ((char-key (read-char-exclusive prompt)))
+ (if (and navigation-keys (memq char-key '(14 16 22 134217846)))
+ (progn
+ (org-scroll char-key)
+ (org--mks-read-key allowed-keys prompt navigation-keys))
+ (let ((key (char-to-string
+ (pcase char-key
+ ((or ?\s ?\t ?\r) ?\t)
+ (char char)))))
+ (if (member key allowed-keys)
+ key
+ (message "Invalid key: `%s'" key)
+ (sit-for 1)
+ (org--mks-read-key allowed-keys prompt navigation-keys))))))
(defun org-mks (table title &optional prompt specials)
"Select a member of an alist with multiple keys.
@@ -461,15 +468,13 @@ 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))
- (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)))
+ (message "") ; With this line the prompt appears in
+ ; the minibuffer. Else keystrokes may
+ ; appear, which is spurious.
+ (let ((pressed (org--mks-read-key
+ allowed-keys prompt
+ (not (pos-visible-in-window-p (1-
(point-max)))))))
(setq current (concat current pressed))
(cond
((equal pressed "\C-g") (user-error "Abort"))
- [elpa] externals/org updated (b1dc454 -> 6b83c6e), Stefan Monnier, 2020/12/17
- [elpa] externals/org baf1e7a 3/8: ob-gnuplot: Fix error on non-string :var assignment, Stefan Monnier, 2020/12/17
- [elpa] externals/org b9f9283 1/8: Merge branch 'maint', Stefan Monnier, 2020/12/17
- [elpa] externals/org 11d186a 2/8: Fix previous commit, Stefan Monnier, 2020/12/17
- [elpa] externals/org 69760ae 4/8: Merge branch 'maint',
Stefan Monnier <=
- [elpa] externals/org 6bdb664 5/8: lisp/ob-haskell.el: Add Lawrence Bottorff as maintainer, Stefan Monnier, 2020/12/17
- [elpa] externals/org 6b83c6e 8/8: org-contacts.el: Add support for org-id generated link., Stefan Monnier, 2020/12/17
- [elpa] externals/org e7f625d 7/8: org-contacts.el: Fix org-store-link error caused by org-contacts, Stefan Monnier, 2020/12/17
- [elpa] externals/org de6d902 6/8: org-attach: Consider inlinetasks when calculating attach dir, Stefan Monnier, 2020/12/17