X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-hello.el;h=8dbb89824397835c4cf5c6e61a6a8d26c3d44a47;hb=6dcb7592e32ed5140ea0c0357ce78d6a37af6066;hp=f8ae332c440ed3b4d9fed18ceb05cd41db6a6e3f;hpb=636925b40b20c60961660d14e0356f0970e97546;p=notmuch diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el index f8ae332c..8dbb8982 100644 --- a/emacs/notmuch-hello.el +++ b/emacs/notmuch-hello.el @@ -19,9 +19,9 @@ ;; ;; Authors: David Edmondson +(eval-when-compile (require 'cl)) (require 'widget) (require 'wid-edit) ; For `widget-forward'. -(require 'cl) (require 'notmuch-lib) (require 'notmuch-mua) @@ -209,11 +209,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 +250,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"))) @@ -378,7 +381,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))