emacs: allow saved searches to select tree-view

This patch allows the user to customize a saved search to choose tree
view rather than the default search view. It also updates notmuch-jump
so that it respects this choice.

diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 7bfa752d2a04d3d3cc0244aac63299979fb9a88e..d9fe3ff60b3159b5abbf9664e65ef97f903cd68e 100644 (file)
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -28,6 +28,8 @@
 
 (declare-function notmuch-search "notmuch" (&optional query oldest-first target-thread target-line continuation))
 (declare-function notmuch-poll "notmuch" ())
+(declare-function notmuch-tree "notmuch-tree"
+                  (&optional query query-context target buffer-name open-target))
 
 (defun notmuch-saved-search-get (saved-search field)
   "Get FIELD from SAVED-SEARCH.
@@ -91,7 +93,11 @@ searches so they still work in customize."
                            (choice :tag " Sort Order"
                                    (const :tag "Default" nil)
                                    (const :tag "Oldest-first" oldest-first)
-                                   (const :tag "Newest-first" newest-first))))))
+                                   (const :tag "Newest-first" newest-first)))
+                    (group :format "%v" :inline t (const :format "" :search-type)
+                           (choice :tag " Search Type"
+                                   (const :tag "Search mode" nil)
+                                   (const :tag "Tree mode" tree))))))
 
 (defcustom notmuch-saved-searches
   `((:name "inbox" :query "tag:inbox" :key ,(kbd "i"))
@@ -425,10 +431,13 @@ diagonal."
          append (notmuch-hello-reflect-generate-row ncols nrows row list))))
 
 (defun notmuch-hello-widget-search (widget &rest ignore)
-  (notmuch-search (widget-get widget
-                             :notmuch-search-terms)
-                 (widget-get widget
-                             :notmuch-search-oldest-first)))
+  (if (widget-get widget :notmuch-search-type)
+      (notmuch-tree (widget-get widget
+                               :notmuch-search-terms))
+    (notmuch-search (widget-get widget
+                               :notmuch-search-terms)
+                   (widget-get widget
+                               :notmuch-search-oldest-first))))
 
 (defun notmuch-saved-search-count (search)
   (car (process-lines notmuch-command "count" search)))
@@ -564,6 +573,7 @@ with `notmuch-hello-query-counts'."
                                     (newest-first nil)
                                     (oldest-first t)
                                     (otherwise notmuch-search-oldest-first)))
+                    (search-type (eq (plist-get elem :search-type) 'tree))
                     (msg-count (plist-get elem :count)))
                (widget-insert (format "%8s "
                                       (notmuch-hello-nice-number msg-count)))
@@ -571,6 +581,7 @@ with `notmuch-hello-query-counts'."
                               :notify #'notmuch-hello-widget-search
                               :notmuch-search-terms query
                               :notmuch-search-oldest-first oldest-first
+                              :notmuch-search-type search-type
                               name)
                (setq column-indent
                      (1+ (max 0 (- column-width (length name)))))))

diff --git a/emacs/notmuch-jump.el b/emacs/notmuch-jump.el
index 20e24b252630fe2992092cbeac8e8f606f27f1c9..506ae2c8e399785c9f56169a1f16589c5d3ad807 100644 (file)
--- a/emacs/notmuch-jump.el
+++ b/emacs/notmuch-jump.el
@@ -54,7 +54,9 @@ fast way to jump to a saved search from anywhere in Notmuch."
                   (oldest-first t)
                   (otherwise (default-value 'notmuch-search-oldest-first)))))
            (push (list key name
-                       `(lambda () (notmuch-search ',query ',oldest-first)))
+                       (if (eq (plist-get saved-search :search-type) 'tree)
+                           `(lambda () (notmuch-tree ',query))
+                         `(lambda () (notmuch-search ',query ',oldest-first))))
                  action-map)))))
     (setq action-map (nreverse action-map))