debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-01-03 15:21:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacs: hello: switch notmuch-hello-insert-buttons to plists

Browse source 
Switching notmuch-hello-insert-buttons to plists means we can easily
pass extra options through to the buttons.
This commit is contained in:
Mark Walters 2014-04-06 06:44:48 +01:00 committed by David Bremner
parent 79c262be66
commit 355d24fb94
1 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
emacs/notmuch-hello.el
View file

@ -424,7 +424,9 @@ QUERY-LIST must be a list of saved-searches. Ideally each of
these is a plist but other options are available for backwards these is a plist but other options are available for backwards
compatibility: see `notmuch-saved-searches' for details. compatibility: see `notmuch-saved-searches' for details.
The result is the list of elements of the form (NAME QUERY COUNT). The result is a list of plists each of which includes the
properties :name NAME, :query QUERY and :count COUNT, together
with any properties in the original saved-search.
The values :show-empty-searches, :filter and :filter-count from The values :show-empty-searches, :filter and :filter-count from
options will be handled as specified for options will be handled as specified for
@ -454,23 +456,26 @@ the CLI and emacs interface."))
#'identity #'identity
(mapcar (mapcar
(lambda (elem) (lambda (elem)
(let ((name (notmuch-saved-search-get elem :name)) (let* ((elem-plist (notmuch-hello-saved-search-to-plist elem))
(search-query (notmuch-saved-search-get elem :query)) (search-query (plist-get elem-plist :query))
(message-count (prog1 (read (current-buffer)) (filtered-query (notmuch-hello-filtered-query
search-query (plist-get options :filter)))
(message-count (prog1 (read (current-buffer))
(forward-line 1)))) (forward-line 1))))
(and (or (plist-get options :show-empty-searches) (> message-count 0)) (when (and filtered-query (or (plist-get options :show-empty-searches) (> message-count 0)))
(list name (notmuch-hello-filtered-query (setq elem-plist (plist-put elem-plist :query filtered-query))
search-query (plist-get options :filter)) (plist-put elem-plist :count message-count))))
message-count))))
query-list)))) query-list))))
(defun notmuch-hello-insert-buttons (searches) (defun notmuch-hello-insert-buttons (searches)
"Insert buttons for SEARCHES. "Insert buttons for SEARCHES.
SEARCHES must be a list containing lists of the form (NAME QUERY COUNT), where SEARCHES must be a list of plists each of which should contain at
QUERY is the query to start when the button for the corresponding entry is least the properties :name NAME :query QUERY and :count COUNT,
activated. COUNT should be the number of messages matching the query. where QUERY is the query to start when the button for the
Such a list can be computed with `notmuch-hello-query-counts'." corresponding entry is activated, and COUNT should be the number
of messages matching the query. Such a plist can be computed
with `notmuch-hello-query-counts'."
(let* ((widest (notmuch-hello-longest-label searches)) (let* ((widest (notmuch-hello-longest-label searches))
(tags-and-width (notmuch-hello-tags-per-line widest)) (tags-and-width (notmuch-hello-tags-per-line widest))
(tags-per-line (car tags-and-width)) (tags-per-line (car tags-and-width))
@ -488,9 +493,9 @@ Such a list can be computed with `notmuch-hello-query-counts'."
(when elem (when elem
(if (> column-indent 0) (if (> column-indent 0)
(widget-insert (make-string column-indent ? ))) (widget-insert (make-string column-indent ? )))
(let* ((name (first elem)) (let* ((name (plist-get elem :name))
(query (second elem)) (query (plist-get elem :query))
(msg-count (third elem))) (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)))
(widget-create 'push-button (widget-create 'push-button