emacs: Add new option notmuch-search-hide-excluded

[notmuch] / emacs / notmuch-jump.el

diff --git a/emacs/notmuch-jump.el b/emacs/notmuch-jump.el
index 51bc4e31f8b78c2918625de2710d41bb8075e174..3161ed9526d52d5b8de9a9d08eb3bef626eb38ec 100644 (file)
--- a/emacs/notmuch-jump.el
+++ b/emacs/notmuch-jump.el
@@ -22,13 +22,13 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cl-lib)
-  (require 'pcase))
-
 (require 'notmuch-lib)
 (require 'notmuch-hello)
 
+(declare-function notmuch-search "notmuch")
+(declare-function notmuch-tree "notmuch-tree")
+(declare-function notmuch-unthreaded "notmuch-tree")
+
 ;;;###autoload
 (defun notmuch-jump-search ()
   "Jump to a saved search by shortcut key.
@@ -50,21 +50,32 @@ fast way to jump to a saved search from anywhere in Notmuch."
                 (cl-case (plist-get saved-search :sort-order)
                   (newest-first nil)
                   (oldest-first t)
-                  (otherwise (default-value 'notmuch-search-oldest-first)))))
+                  (otherwise (default-value 'notmuch-search-oldest-first))))
+               (exclude (cl-case (plist-get saved-search :excluded)
+                          (hide t)
+                          (show nil)
+                          (otherwise notmuch-search-hide-excluded))))
            (push (list key name
                        (cond
                         ((eq (plist-get saved-search :search-type) 'tree)
-                         `(lambda () (notmuch-tree ',query)))
+                         (lambda () (notmuch-tree query nil nil nil nil nil nil
+                                             oldest-first exclude)))
                         ((eq (plist-get saved-search :search-type) 'unthreaded)
-                         `(lambda () (notmuch-unthreaded ',query)))
+                         (lambda () (notmuch-unthreaded query nil nil nil nil
+                                                   oldest-first exclude)))
                         (t
-                         `(lambda () (notmuch-search ',query ',oldest-first)))))
+                         (lambda () (notmuch-search query oldest-first exclude)))))
                  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 +138,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 +178,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 +202,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)