From: Carl Worth <cworth@cworth.org>
Date: Tue, 27 Apr 2010 00:55:55 +0000 (-0700)
Subject: emacs: notmuch-hello: Don't include extra spaces in widget values.
X-Git-Tag: 0.3~33
X-Git-Url: https://git.cworth.org/git?p=obsolete%2Fnotmuch-old;a=commitdiff_plain;h=c9ba61bebef7733c4bf12adf94222e57621fdcf6

emacs: notmuch-hello: Don't include extra spaces in widget values.

Previously, trailing spaces after each saved-search name were included
as part of the widget. This is going to be problematic for a future
change that will extract the widget's value and compare it to the
configured names of saved searches.

Instead, just include the name itself in the widget, and then insert
the spaces for separation afterwards.
---

diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 7333e156..b4423edf 100644
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -148,8 +148,7 @@ diagonal."
 		  nil nil #'notmuch-hello-search-continuation))
 
 (defun notmuch-hello-insert-tags (tag-alist widest)
-  (let* ((tag-format-string (format "%%-%ds " widest))
-	 (tags-per-line (max 1
+  (let* ((tags-per-line (max 1
 			     (/ (- (window-width) notmuch-hello-indent)
 				;; Count is 7 wide, 1 for the space
 				;; after the name.
@@ -169,7 +168,8 @@ diagonal."
 		 (widget-create 'push-button
 				:notify #'notmuch-hello-widget-search
 				:notmuch-search-terms (cdr elem)
-				(format tag-format-string (car elem))))
+				(car elem))
+		 (insert (make-string (- widest (length (car elem))) ? )))
 	       (setq count (1+ count))
 	       (if (eq (% count tags-per-line) 0)
 		   (widget-insert "\n"))))