X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-jump.el;h=0dc23fb92fa732f44e299e63e2cc91987b6ac3b4;hb=27c8e377e450706fd7f21a15888da277658c48ee;hp=51bc4e31f8b78c2918625de2710d41bb8075e174;hpb=0067a43ea2ee554eafed1e1300a71259cd6b6a6d;p=notmuch

diff --git a/emacs/notmuch-jump.el b/emacs/notmuch-jump.el
index 51bc4e31..0dc23fb9 100644
--- a/emacs/notmuch-jump.el
+++ b/emacs/notmuch-jump.el
@@ -22,10 +22,6 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cl-lib)
-  (require 'pcase))
-
 (require 'notmuch-lib)
 (require 'notmuch-hello)
 
@@ -54,17 +50,22 @@ fast way to jump to a saved search from anywhere in Notmuch."
 	    (push (list key name
 			(cond
 			 ((eq (plist-get saved-search :search-type) 'tree)
-			  `(lambda () (notmuch-tree ',query)))
+			  (lambda () (notmuch-tree query)))
 			 ((eq (plist-get saved-search :search-type) 'unthreaded)
-			  `(lambda () (notmuch-unthreaded ',query)))
+			  (lambda () (notmuch-unthreaded query)))
 			 (t
-			  `(lambda () (notmuch-search ',query ',oldest-first)))))
+			  (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, %s"
+	     "please customize shortcut keys in notmuch-saved-searches."))))
+
+(defface notmuch-jump-key
+  '((t :inherit minibuffer-prompt))
+  "Default face used for keys in `notmuch-jump' and related."
+  :group 'notmuch-faces)
 
 (defvar notmuch-jump--action nil)
 
@@ -127,7 +128,7 @@ buffer."
     ;; Format each action
     (mapcar (pcase-lambda (`(,key ,desc))
 	      (setq key (format-kbd-macro key))
-	      (concat (propertize key 'face 'minibuffer-prompt)
+	      (concat (propertize key 'face 'notmuch-jump-key)
 		      (make-string (- key-width (length key)) ? )
 		      " " desc))
 	    action-map)))
@@ -167,9 +168,10 @@ buffer."
     (pcase-dolist (`(,key ,_name ,fn) action-map)
       (when (= (length key) 1)
 	(define-key map key
-	  `(lambda () (interactive)
-	     (setq notmuch-jump--action ',fn)
-	     (exit-minibuffer)))))
+	  (lambda ()
+	    (interactive)
+	    (setq notmuch-jump--action fn)
+	    (exit-minibuffer)))))
     ;; 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.
@@ -190,12 +192,13 @@ buffer."
 		  action-submap)
 	    (setq action-submap (nreverse action-submap))
 	    (define-key map keystr
-	      `(lambda () (interactive)
-		 (setq notmuch-jump--action
-		       ',(apply-partially #'notmuch-jump
-					  action-submap
-					  new-prompt))
-		 (exit-minibuffer)))))))
+	      (lambda ()
+		(interactive)
+		(setq notmuch-jump--action
+		      (apply-partially #'notmuch-jump
+				       action-submap
+				       new-prompt))
+		(exit-minibuffer)))))))
     map))
 
 (provide 'notmuch-jump)