X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-hello.el;h=cbe414f1e9a0d111fac4aba2b215845a34ae2ed2;hb=9b85872ed4526688a6195cfa8af19be20ed869c2;hp=5d1f1f8522be8090aa2c654fc3995c6303aee4da;hpb=51e5eaac172b37a7000bff0a7e5cf1229239aba3;p=notmuch

diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 5d1f1f85..cbe414f1 100644
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -27,7 +27,7 @@
 (require 'notmuch-mua)
 
 (declare-function notmuch-search "notmuch" (query &optional oldest-first target-thread target-line continuation))
-(declare-function notmuch-folder-count "notmuch" (search))
+(declare-function notmuch-poll "notmuch" ())
 
 (defvar notmuch-hello-search-bar-marker nil
   "The position of the search bar within the notmuch-hello buffer.")
@@ -45,11 +45,6 @@
 (defvar notmuch-hello-indent 4
   "How much to indent non-headers.")
 
-(defcustom notmuch-saved-searches notmuch-folders
-  "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
@@ -147,6 +142,9 @@ diagonal."
 		  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)
@@ -165,7 +163,7 @@ diagonal."
 	  do (progn
 	       ;; (not elem) indicates an empty slot in the matrix.
 	       (when elem
-		 (widget-insert (format "%6s " (notmuch-folder-count (cdr elem))))
+		 (widget-insert (format "%6s " (notmuch-saved-search-count (cdr elem))))
 		 (if (string= (format "%s " (car elem)) target)
 		     (setq found-target-pos (point-marker)))
 		 (widget-create 'push-button
@@ -198,9 +196,20 @@ diagonal."
   (interactive)
   (notmuch-hello no-display))
 
+(defun notmuch-hello-poll-and-update ()
+  "Invoke `notmuch-poll' to import mail, then refresh the current view."
+  (interactive)
+  (notmuch-poll)
+  (notmuch-hello-update))
+
 (defun notmuch-hello (&optional no-display)
   (interactive)
 
+  ; 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-saved-searches)))
+
   (if no-display
       (set-buffer "*notmuch-hello*")
     (switch-to-buffer "*notmuch-hello*"))
@@ -262,7 +271,7 @@ diagonal."
 	      (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)))
@@ -377,6 +386,7 @@ diagonal."
 
       (use-local-map widget-keymap)
       (local-set-key "=" 'notmuch-hello-update)
+      (local-set-key "G" 'notmuch-hello-poll-and-update)
       (local-set-key "m" 'notmuch-mua-mail)
       (local-set-key "q" '(lambda () (interactive) (kill-buffer (current-buffer))))
       (local-set-key "s" 'notmuch-hello-goto-search)
@@ -389,6 +399,12 @@ diagonal."
       (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)