X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-jump.el;h=adf796504bd224f123df3c5ab2475b87675f3b81;hb=09f6533c3781b61ea634790d4bad38aadf89115c;hp=84fe2b9c2435b2cc4ac67760313e637c150ee202;hpb=ed40579ad3882e6f9bbe9b1ba5e707ab289ca203;p=notmuch diff --git a/emacs/notmuch-jump.el b/emacs/notmuch-jump.el index 84fe2b9c..adf79650 100644 --- a/emacs/notmuch-jump.el +++ b/emacs/notmuch-jump.el @@ -43,7 +43,6 @@ keys configured in the :key property of `notmuch-saved-searches'. Typically these shortcuts are a single key long, so this is a fast way to jump to a saved search from anywhere in Notmuch." (interactive) - ;; Build the action map (let (action-map) (dolist (saved-search notmuch-saved-searches) @@ -67,10 +66,10 @@ fast way to jump to a saved search from anywhere in Notmuch." `(lambda () (notmuch-search ',query ',oldest-first))))) action-map))))) (setq action-map (nreverse action-map)) - (if action-map (notmuch-jump action-map "Search: ") - (error "To use notmuch-jump, please customize shortcut keys in notmuch-saved-searches.")))) + (error "To use notmuch-jump, \ +please customize shortcut keys in notmuch-saved-searches.")))) (defvar notmuch-jump--action nil) @@ -89,7 +88,6 @@ where KEY is a key binding, LABEL is a string label to display in the buffer, and ACTION is a nullary function to call. LABEL may be null, in which case the action will still be bound, but will not appear in the pop-up buffer." - (let* ((items (notmuch-jump--format-actions action-map)) ;; Format the table of bindings and the full prompt (table @@ -114,7 +112,6 @@ not appear in the pop-up buffer." (notmuch-jump--action nil)) ;; Read the action (read-from-minibuffer full-prompt nil minibuffer-map) - ;; If we got an action, do it (when notmuch-jump--action (funcall notmuch-jump--action)))) @@ -125,7 +122,6 @@ not appear in the pop-up buffer." Returns a list of strings, one for each item with a label in ACTION-MAP. These strings can be inserted into a tabular buffer." - ;; Compute the maximum key description width (let ((key-width 1)) (pcase-dolist (`(,key ,desc) action-map) @@ -200,7 +196,9 @@ buffer." (define-key map keystr `(lambda () (interactive) (setq notmuch-jump--action - ',(apply-partially #'notmuch-jump action-submap new-prompt)) + ',(apply-partially #'notmuch-jump + action-submap + new-prompt)) (exit-minibuffer))))))) map))