debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 10:58:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacs: allow saved searches to select tree-view

Browse source 
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.
This commit is contained in:
Mark Walters 2015-10-14 09:38:22 +01:00 committed by David Bremner
parent bf719963a7
commit 391d9f9420
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
emacs/notmuch-hello.el
View file

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

4
emacs/notmuch-jump.el
View file

@ -54,7 +54,9 @@ fast way to jump to a saved search from anywhere in Notmuch."
(oldest-first t) (oldest-first t)
(otherwise (default-value 'notmuch-search-oldest-first))))) (otherwise (default-value 'notmuch-search-oldest-first)))))
(push (list key name (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))))) action-map)))))
(setq action-map (nreverse action-map)) (setq action-map (nreverse action-map))