X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.el;h=6c9004ecfa0307519d4acd16ea8c7c580ffba2d0;hp=8fba25d4aabfb50741680c380aaf4e27f15fc8e9;hb=0d58d46f7af39ba85209a7026644d36998c88a45;hpb=0a1e37a8c97ff8cc25a13e6f1a9989eecf30bde2

diff --git a/notmuch.el b/notmuch.el
index 8fba25d4..6c9004ec 100644
--- a/notmuch.el
+++ b/notmuch.el
@@ -1446,12 +1446,15 @@ current search results AND that are tagged with the given tag."
     (define-key map "?" 'notmuch-help)
     (define-key map "x" 'kill-this-buffer)
     (define-key map "q" 'kill-this-buffer)
+    (define-key map "m" 'message-mail)
+    (define-key map "e" 'notmuch-folder-show-empty-toggle)
     (define-key map ">" 'notmuch-folder-last)
     (define-key map "<" 'notmuch-folder-first)
     (define-key map "=" 'notmuch-folder)
     (define-key map "s" 'notmuch-search)
     (define-key map [mouse-1] 'notmuch-folder-show-search)
     (define-key map (kbd "RET") 'notmuch-folder-show-search)
+    (define-key map " " 'notmuch-folder-show-search)
     (define-key map "p" 'notmuch-folder-previous)
     (define-key map "n" 'notmuch-folder-next)
     map)
@@ -1521,22 +1524,40 @@ Currently available key bindings:
   (goto-char (point-max))
   (forward-line -1))
 
+(defun notmuch-folder-count (search)
+  (car (process-lines notmuch-command "count" search)))
+
+(setq notmuch-folder-show-empty t)
+
+(defun notmuch-folder-show-empty-toggle ()
+  "Toggle the listing of empty folders"
+  (interactive)
+  (setq notmuch-folder-show-empty (not notmuch-folder-show-empty))
+  (notmuch-folder))
+
 (defun notmuch-folder-add (folders)
   (if folders
-      (let ((name (car (car folders)))
+      (let* ((name (car (car folders)))
 	    (inhibit-read-only t)
-	    (search (cdr (car folders))))
-	(insert name)
-	(indent-to 16 1)
-	(call-process notmuch-command nil t nil "count" search)
+	    (search (cdr (car folders)))
+	    (count (notmuch-folder-count search)))
+	(if (or notmuch-folder-show-empty
+		(not (equal count "0")))
+	    (progn
+	      (insert name)
+	      (indent-to 16 1)
+	      (insert count)
+	      (insert "\n")
+	      )
+	  )
 	(notmuch-folder-add (cdr folders)))))
 
 (defun notmuch-folder-find-name ()
   (save-excursion
     (beginning-of-line)
     (let ((beg (point)))
-      (forward-word)
-      (filter-buffer-substring beg (point)))))
+      (re-search-forward "\\([ \t]*[^ \t]+\\)")
+      (filter-buffer-substring (match-beginning 1) (match-end 1)))))
 
 (defun notmuch-folder-show-search (&optional folder)
   "Show a search window for the search related to the specified folder."