(defvar notmuch-hello-indent 4
"How much to indent non-headers.")
-(defcustom notmuch-saved-searches nil
- "A list of saved searches to display."
- :type '(alist :key-type string :value-type string)
- :group 'notmuch)
-
(defcustom notmuch-show-logo t
"Should the notmuch logo be shown?"
:type 'boolean
notmuch-search-oldest-first
nil nil #'notmuch-hello-search-continuation))
+(defun notmuch-saved-search-count (search)
+ (car (process-lines notmuch-command "count" search)))
+
(defun notmuch-hello-insert-tags (tag-alist widest target)
(let* ((tags-per-line (max 1
(/ (- (window-width) notmuch-hello-indent)
- ;; Count is 7 wide, 1 for the space
- ;; after the name.
+ ;; Count is 7 wide (6 digits plus
+ ;; space), 1 for the space after the
+ ;; name.
(+ 7 1 widest))))
(count 0)
(reordered-list (notmuch-hello-reflect tag-alist tags-per-line))
(found-target-pos nil))
;; dme: It feels as though there should be a better way to
;; implement this loop than using an incrementing counter.
- (loop for elem in reordered-list
- do (progn
- ;; (not elem) indicates an empty slot in the matrix.
- (when elem
- (widget-insert (format "%6s " (notmuch-folder-count (cdr elem))))
- (if (string= (format "%s " (car elem)) target)
- (setq found-target-pos (point-marker)))
- (widget-create 'push-button
- :notify #'notmuch-hello-widget-search
- :notmuch-search-terms (cdr elem)
- (format "%s " (car elem)))
- (insert (make-string (1+ (- widest (length (car elem)))) ? )))
- (setq count (1+ count))
- (if (eq (% count tags-per-line) 0)
- (widget-insert "\n"))))
+ (mapc (lambda (elem)
+ ;; (not elem) indicates an empty slot in the matrix.
+ (when elem
+ (let* ((name (car elem))
+ (query (cdr elem))
+ (formatted-name (format "%s " name)))
+ (widget-insert (format "%6s " (notmuch-saved-search-count query)))
+ (if (string= formatted-name target)
+ (setq found-target-pos (point-marker)))
+ (widget-create 'push-button
+ :notify #'notmuch-hello-widget-search
+ :notmuch-search-terms query
+ formatted-name)
+ ;; Insert enough space to consume the rest of the
+ ;; column. Because the button for the name is `(1+
+ ;; (length name))' long (due to the trailing space) we
+ ;; can just insert `(- widest (length name))' spaces -
+ ;; the column separator is included in the button if
+ ;; `(equal widest (length name)'.
+ (widget-insert (make-string (- widest (length name)) ? )))
+ (setq count (1+ count))
+ (if (eq (% count tags-per-line) 0)
+ (widget-insert "\n"))))
+ reordered-list)
;; If the last line was not full (and hence did not include a
;; carriage return), insert one now.
(defun notmuch-hello (&optional no-display)
(interactive)
- ;; Provide support for the deprecated name of this variable
+ ; Jump through a hoop to get this value from the deprecated variable
+ ; name (`notmuch-folders') or from the default value.
(if (not notmuch-saved-searches)
- (setq notmuch-saved-searches notmuch-folders))
-
- ;; And set a default if neither has been set by the user
- (if (not notmuch-saved-searches)
- (setq notmuch-saved-searches '(("inbox" . "tag:inbox")
- ("unread" . "tag:unread"))))
+ (setq notmuch-saved-searches (notmuch-saved-searches)))
(if no-display
(set-buffer "*notmuch-hello*")
(if notmuch-show-empty-saved-searches
notmuch-saved-searches
(loop for elem in notmuch-saved-searches
- if (> (string-to-number (notmuch-folder-count (cdr elem))) 0)
+ if (> (string-to-number (notmuch-saved-search-count (cdr elem))) 0)
collect elem)))
(saved-widest (notmuch-hello-longest-label saved-alist))
- (alltags-alist (mapcar '(lambda (tag) (cons tag (concat "tag:" tag)))
- (process-lines notmuch-command "search-tags")))
+ (alltags-alist (if notmuch-show-all-tags-list
+ (mapcar '(lambda (tag) (cons tag (concat "tag:" tag)))
+ (process-lines notmuch-command "search-tags"))))
(alltags-widest (notmuch-hello-longest-label alltags-alist))
(widest (max saved-widest alltags-widest)))
(indent-rigidly start (point) notmuch-hello-indent)))
(when alltags-alist
- (if notmuch-show-all-tags-list
- (progn
- (widget-insert "\nAll tags: ")
- (widget-create 'push-button
- :notify (lambda (widget &rest ignore)
- (setq notmuch-show-all-tags-list nil)
- (notmuch-hello-update))
- "hide")
- (widget-insert "\n\n")
- (let ((start (point)))
- (setq found-target-pos (notmuch-hello-insert-tags alltags-alist widest target))
- (if (not final-target-pos)
- (setq final-target-pos found-target-pos))
- (indent-rigidly start (point) notmuch-hello-indent)))
- (widget-insert "\n")
+ (widget-insert "\nAll tags: ")
+ (widget-create 'push-button
+ :notify (lambda (widget &rest ignore)
+ (setq notmuch-show-all-tags-list nil)
+ (notmuch-hello-update))
+ "hide")
+ (widget-insert "\n\n")
+ (let ((start (point)))
+ (setq found-target-pos (notmuch-hello-insert-tags alltags-alist widest target))
+ (if (not final-target-pos)
+ (setq final-target-pos found-target-pos))
+ (indent-rigidly start (point) notmuch-hello-indent)))
+
+ (widget-insert "\n")
+
+ (if (not notmuch-show-all-tags-list)
(widget-create 'push-button
:notify (lambda (widget &rest ignore)
(setq notmuch-show-all-tags-list t)
(notmuch-hello-update))
- "Show all tags"))))
+ "Show all tags")))
(let ((start (point)))
(widget-insert "\n\n")
(if (not (widget-at))
(widget-forward 1)))))
+;;;###autoload
+(defun notmuch-folder ()
+ "Deprecated function for invoking notmuch---calling `notmuch' is preferred now."
+ (interactive)
+ (notmuch-hello))
+
;;
(provide 'notmuch-hello)
projects / notmuch / blobdiff