X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-hello.el;h=d9fe3ff60b3159b5abbf9664e65ef97f903cd68e;hb=ddbda8f501f7ad8b6e7ad59e2d8b6375b6438f49;hp=7bfa752d2a04d3d3cc0244aac63299979fb9a88e;hpb=33c8777a967ece2dd4bbda7e83a4e07c195abf51;p=notmuch diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el index 7bfa752d..d9fe3ff6 100644 --- 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)))))))