X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-hello.el;h=4b6a90dbc0ecc3e5a334c3a68d301e451c57fa46;hb=d064bd696ccc443a7ece9cfc8816999c69943223;hp=f8ae332c440ed3b4d9fed18ceb05cd41db6a6e3f;hpb=636925b40b20c60961660d14e0356f0970e97546;p=notmuch

diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index f8ae332c..4b6a90db 100644
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -19,9 +19,9 @@
 ;;
 ;; Authors: David Edmondson <dme@dme.org>
 
+(eval-when-compile (require 'cl))
 (require 'widget)
 (require 'wid-edit) ; For `widget-forward'.
-(require 'cl)
 
 (require 'notmuch-lib)
 (require 'notmuch-mua)
@@ -115,6 +115,7 @@ Typically \",\" in the US and UK and \".\" in Europe."
     (while (> n 0)
       (push (% n 1000) result)
       (setq n (/ n 1000)))
+    (setq result (or result '(0)))
     (apply #'concat
      (number-to-string (car result))
      (mapcar (lambda (elem)
@@ -209,11 +210,12 @@ should be. Returns a cons cell `(tags-per-line width)'."
 		   ;; after the name.
 		   (+ 9 1 widest)))))))
 
-    (cons tags-per-line (/ (- (window-width) notmuch-hello-indent
-			      ;; Count is 9 wide (8 digits plus
-			      ;; space), 1 for the space after the
-			      ;; name.
-			      (* tags-per-line (+ 9 1)))
+    (cons tags-per-line (/ (max 1
+				(- (window-width) notmuch-hello-indent
+				   ;; Count is 9 wide (8 digits plus
+				   ;; space), 1 for the space after the
+				   ;; name.
+				   (* tags-per-line (+ 9 1))))
 			   tags-per-line))))
 
 (defun notmuch-hello-insert-tags (tag-alist widest target)
@@ -249,7 +251,9 @@ should be. Returns a cons cell `(tags-per-line width)'."
 		;; 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)) ? ))))
+		(widget-insert (make-string (max 1
+						 (- widest (length name)))
+					    ? ))))
 	    (setq count (1+ count))
 	    (if (eq (% count tags-per-line) 0)
 		(widget-insert "\n")))
@@ -314,7 +318,9 @@ Complete list of currently available key bindings:
  ;;(setq buffer-read-only t)
 )
 
+;;;###autoload
 (defun notmuch-hello (&optional no-display)
+  "Run notmuch and display saved searches, known tags, etc."
   (interactive)
 
   ; Jump through a hoop to get this value from the deprecated variable
@@ -378,7 +384,7 @@ Complete list of currently available key bindings:
 		     :help-echo "Refresh"
 		     (notmuch-hello-nice-number
 		      (string-to-number (car (process-lines notmuch-command "count")))))
-      (widget-insert " messages (that's not much mail).\n"))
+      (widget-insert " messages.\n"))
 
     (let ((found-target-pos nil)
 	  (final-target-pos nil))
@@ -510,7 +516,6 @@ Complete list of currently available key bindings:
       (unless (widget-at)
 	(notmuch-hello-goto-search)))))
 
-;;;###autoload
 (defun notmuch-folder ()
   "Deprecated function for invoking notmuch---calling `notmuch' is preferred now."
   (interactive)