(declare-function notmuch-poll "notmuch-lib" ())
(declare-function notmuch-tree "notmuch-tree"
(&optional query query-context target buffer-name
- open-target unthreaded parent-buffer oldest-first))
+ open-target unthreaded parent-buffer
+ oldest-first hide-excluded))
(declare-function notmuch-unthreaded "notmuch-tree"
(&optional query query-context target buffer-name
- open-target))
+ open-target oldest-first hide-excluded))
;;; Options
:sort-order Specify the sort order to be used for the search.
Possible values are `oldest-first', `newest-first'
or nil. Nil means use the default sort order.
+ :excluded Whether to show mail with excluded tags in the
+ search. Possible values are `hide', `show',
+ or nil. Nil means use the default value of
+ `notmuch-search-hide-excluded'.
:search-type Specify whether to run the search in search-mode,
tree mode or unthreaded mode. Set to `tree' to
- specify tree mode, 'unthreaded to specify
+ specify tree mode, \\='unthreaded to specify
unthreaded mode, and set to nil (or anything
except tree and unthreaded) to specify search
mode.
(defvar notmuch-hello-indent 4
"How much to indent non-headers.")
-(defimage notmuch-hello-logo ((:type png :file "notmuch-logo.png")))
+(defimage notmuch-hello-logo ((:type svg :file "notmuch-logo.svg")))
(defcustom notmuch-show-logo t
"Should the notmuch logo be shown?"
append (notmuch-hello-reflect-generate-row ncols nrows row list))))
(defun notmuch-hello-widget-search (widget &rest _ignore)
- (cl-case (widget-get widget :notmuch-search-type)
- (tree
- (notmuch-tree (widget-get widget :notmuch-search-terms)
- nil nil nil nil nil nil
- (widget-get widget :notmuch-search-oldest-first)))
- (unthreaded
- (notmuch-unthreaded (widget-get widget :notmuch-search-terms)))
- (t
- (notmuch-search (widget-get widget :notmuch-search-terms)
- (widget-get widget :notmuch-search-oldest-first)))))
+ (let ((search-terms (widget-get widget :notmuch-search-terms))
+ (oldest-first (widget-get widget :notmuch-search-oldest-first))
+ (exclude (widget-get widget :notmuch-search-hide-excluded)))
+ (cl-case (widget-get widget :notmuch-search-type)
+ (tree
+ (let ((n (notmuch-search-format-buffer-name (widget-value widget) "tree" t)))
+ (notmuch-tree search-terms nil nil n nil nil nil oldest-first exclude)))
+ (unthreaded
+ (let ((n (notmuch-search-format-buffer-name (widget-value widget)
+ "unthreaded" t)))
+ (notmuch-unthreaded search-terms nil nil n nil oldest-first exclude)))
+ (t
+ (notmuch-search search-terms oldest-first exclude)))))
(defun notmuch-saved-search-count (search)
(car (notmuch--process-lines notmuch-command "count" search)))
The values :show-empty-searches, :filter and :filter-count from
options will be handled as specified for
-`notmuch-hello-insert-searches'."
+`notmuch-hello-insert-searches'. :disable-includes can be used to
+turn off the default exclude processing in `notmuch-count(1)'"
(with-temp-buffer
(dolist (elem query-list nil)
(let ((count-query (or (notmuch-saved-search-get elem :count-query)
(plist-get options :filter))))
"\n")))
(unless (= (notmuch--call-process-region (point-min) (point-max) notmuch-command
- t t nil "count" "--batch") 0)
+ t t nil "count"
+ (if (plist-get options :disable-excludes)
+ "--exclude=false"
+ "--exclude=true")
+ "--batch") 0)
(notmuch-logged-error
"notmuch count --batch failed"
"Please check that the notmuch CLI is new enough to support `count
(newest-first nil)
(oldest-first t)
(otherwise notmuch-search-oldest-first)))
+ (exclude (cl-case (plist-get elem :excluded)
+ (hide t)
+ (show nil)
+ (otherwise notmuch-search-hide-excluded)))
(search-type (plist-get elem :search-type))
(msg-count (plist-get elem :count)))
(widget-insert (format "%8s "
:notmuch-search-terms query
:notmuch-search-oldest-first oldest-first
:notmuch-search-type search-type
+ :notmuch-search-hide-excluded exclude
name)
(setq column-indent
(1+ (max 0 (- column-width (length name)))))))
;; that when we modify map it does not modify widget-keymap).
(let ((map (make-composed-keymap (list (make-sparse-keymap) widget-keymap))))
(set-keymap-parent map notmuch-common-keymap)
+ ;; Currently notmuch-hello-mode supports free text entry, but not
+ ;; tagging operations, so provide standard undo.
+ (define-key map [remap notmuch-tag-undo] #'undo)
map)
"Keymap for \"notmuch hello\" buffers.")
(define-derived-mode notmuch-hello-mode fundamental-mode "notmuch-hello"
- "Major mode for convenient notmuch navigation. This is your entry portal into notmuch.
+ "Major mode for convenient notmuch navigation. This is your entry
+portal into notmuch.
Saved searches are \"bookmarks\" for arbitrary queries. Hit RET
or click on a saved search to view matching threads. Edit saved
:help-echo "Refresh"
(notmuch-hello-nice-number
(string-to-number
- (car (notmuch--process-lines notmuch-command "count")))))
+ (car (notmuch--process-lines notmuch-command "count" "--exclude=false")))))
(widget-insert " messages.\n")))
(defun notmuch-hello-insert-saved-searches ()
(widget-create 'notmuch-search-item :value search :size width)))))
(defun notmuch-hello-insert-searches (title query-list &rest options)
- "Insert a section with TITLE showing a list of buttons made from QUERY-LIST.
+ "Insert a section with TITLE showing a list of buttons made from
+QUERY-LIST.
QUERY-LIST should ideally be a plist but for backwards
compatibility other forms are also accepted (see
:show-empty-searches - show buttons with no matching messages
:hide-if-empty - hide if no buttons would be shown
(only makes sense without :show-empty-searches)
-:filter - This can be a function that takes the search query as its argument and
- returns a filter to be used in conjunction with the query for that search or nil
- to hide the element. This can also be a string that is used as a combined with
- each query using \"and\".
-:filter-count - Separate filter to generate the count displayed each search. Accepts
- the same values as :filter. If :filter and :filter-count are specified, this
- will be used instead of :filter, not in conjunction with it."
+:filter - This can be a function that takes the search query as
+ its argument and returns a filter to be used in conjunction
+ with the query for that search or nil to hide the
+ element. This can also be a string that is used as a combined
+ with each query using \"and\".
+:filter-count - Separate filter to generate the count displayed
+ each search. Accepts the same values as :filter. If :filter
+ and :filter-count are specified, this will be used instead of
+ :filter, not in conjunction with it."
+
(widget-insert title ": ")
(when (and notmuch-hello-first-run (plist-get options :initially-hidden))
(add-to-list 'notmuch-hello-hidden-sections title))
nil
:initially-hidden (not notmuch-show-all-tags-list)
:hide-tags notmuch-hello-hide-tags
- :filter notmuch-hello-tag-list-make-query))
+ :filter notmuch-hello-tag-list-make-query
+ :disable-excludes t))
(defun notmuch-hello-insert-footer ()
"Insert the notmuch-hello footer."
projects / notmuch / blobdiff