X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-jump.el;h=51bc4e31f8b78c2918625de2710d41bb8075e174;hb=9be8c6802fa5ce7fa61a2656daf337ac935da423;hp=e302fe00df85b9ed18b00bf687fd412f7cebb9f9;hpb=e1a700067a22214f54064c281219fbbbef87de06;p=notmuch diff --git a/emacs/notmuch-jump.el b/emacs/notmuch-jump.el index e302fe00..51bc4e31 100644 --- a/emacs/notmuch-jump.el +++ b/emacs/notmuch-jump.el @@ -1,4 +1,4 @@ -;;; notmuch-jump.el --- User-friendly shortcut keys +;;; notmuch-jump.el --- User-friendly shortcut keys -*- lexical-binding: t -*- ;; ;; Copyright © Austin Clements ;; @@ -29,11 +29,6 @@ (require 'notmuch-lib) (require 'notmuch-hello) -(eval-and-compile - (unless (fboundp 'window-body-width) - ;; Compatibility for Emacs pre-24 - (defalias 'window-body-width 'window-width))) - ;;;###autoload (defun notmuch-jump-search () "Jump to a saved search by shortcut key. @@ -73,6 +68,7 @@ please customize shortcut keys in notmuch-saved-searches.")))) (defvar notmuch-jump--action nil) +;;;###autoload (defun notmuch-jump (action-map prompt) "Interactively prompt for one of the keys in ACTION-MAP. @@ -124,7 +120,7 @@ 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) + (pcase-dolist (`(,key ,_desc) action-map) (setq key-width (max key-width (string-width (format-kbd-macro key))))) @@ -168,7 +164,7 @@ buffer." "Translate ACTION-MAP into a minibuffer keymap." (let ((map (make-sparse-keymap))) (set-keymap-parent map notmuch-jump-minibuffer-map) - (pcase-dolist (`(,key ,name ,fn) action-map) + (pcase-dolist (`(,key ,_name ,fn) action-map) (when (= (length key) 1) (define-key map key `(lambda () (interactive) @@ -177,7 +173,7 @@ buffer." ;; By doing this in two passes (and checking if we already have a ;; binding) we avoid problems if the user specifies a binding which ;; is a prefix of another binding. - (pcase-dolist (`(,key ,name ,fn) action-map) + (pcase-dolist (`(,key ,_name ,_fn) action-map) (when (> (length key) 1) (let* ((key (elt key 0)) (keystr (string key)) @@ -202,8 +198,6 @@ buffer." (exit-minibuffer))))))) map)) -;; - (provide 'notmuch-jump) ;;; notmuch-jump.el ends here