X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;ds=sidebyside;f=emacs%2Fnotmuch-hello.el;h=cbe414f1e9a0d111fac4aba2b215845a34ae2ed2;hb=9b85872ed4526688a6195cfa8af19be20ed869c2;hp=e3132a9066e62d2fe2fd81c3e1457d5afb2b255e;hpb=4727eacb36245ccd2eabe22bfa408a099b574255;p=notmuch

diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index e3132a90..cbe414f1 100644
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -45,11 +45,6 @@
 (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
@@ -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
@@ -207,14 +205,10 @@ diagonal."
 (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*")
@@ -277,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)))
@@ -405,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)