mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-29 07:58:21 +00:00
Code

Merge branch 'maint'

Browse Source
This commit is contained in:
Nicolas Goaziou 2017-01-31 22:52:43 +01:00
commit 5edc17ef73
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/org-capture.el
View File

@ -1506,17 +1506,17 @@ is selected, only the bare key is returned."
(message "Invalid key `%s'" pressed) (sit-for 1) (message "Invalid key `%s'" pressed) (sit-for 1)
(message prompt) (message prompt)
(setq pressed (char-to-string (read-char-exclusive)))) (setq pressed (char-to-string (read-char-exclusive))))
(setq current (concat current pressed))
(cond (cond
((equal pressed "\C-g") (user-error "Abort")) ((equal pressed "\C-g") (user-error "Abort"))
;; Selection is a prefix: open a new menu. ;; Selection is a prefix: open a new menu.
((member pressed des-keys) ((member pressed des-keys))
(setq current (concat current pressed)))
;; Selection matches an association: return it. ;; Selection matches an association: return it.
((let ((entry (assoc pressed table))) ((let ((entry (assoc current table)))
(and entry (throw 'exit entry)))) (and entry (throw 'exit entry))))
;; Selection matches a special entry: return the ;; Selection matches a special entry: return the
;; selection prefix. ;; selection prefix.
((assoc pressed specials) (throw 'exit pressed)) ((assoc current specials) (throw 'exit current))
(t (error "No entry available"))))))) (t (error "No entry available")))))))
(when buffer (kill-buffer buffer)))))) (when buffer (kill-buffer buffer))))))