emacs: add invisible space after the search widget field in notmuch-hello

It is very convenient when C-e (bound to `widget-end-of-line') ignores
trailing spaces inside the search widget.  But it only does so if a
widget is not followed by a newline (that is why it works in the saved
search widgets).  The patch just adds an invisible space after the
search widget to get the desirable behavior of `widget-end-of-line'.
The extra space is also added to expected results of emacs tests.

diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 65fde75a07d3b3ad10179315941c29ab0a26bacb..1a76c30abed9d79eafe1da8c30acc9ad5bf93561 100644 (file)
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -462,6 +462,10 @@ Complete list of currently available key bindings:
                                       (length "Search: ")))
                       :action (lambda (widget &rest ignore)
                                 (notmuch-hello-search (widget-value widget))))
+       ;; add an invisible space to make `widget-end-of-line' ignore
+       ;; trailine spaces in the search widget field
+       (widget-insert " ")
+       (put-text-property (1- (point)) (point) 'invisible t)
        (widget-insert "\n")
 
        (when notmuch-hello-recent-searches

diff --git a/test/emacs.expected-output/notmuch-hello b/test/emacs.expected-output/notmuch-hello
index 64b7e42c31770fd1fd9b345d3437f8cd6f6e4616..48143bd73055a07f7f3394ca95f9f16ca053335f 100644 (file)
--- a/test/emacs.expected-output/notmuch-hello
+++ b/test/emacs.expected-output/notmuch-hello
@@ -4,7 +4,7 @@ Saved searches: [edit]
 
          50 inbox           50 unread    
 
-Search:                                                                     
+Search:                                                                      
 
 [Show all tags]
 

diff --git a/test/emacs.expected-output/notmuch-hello-no-saved-searches b/test/emacs.expected-output/notmuch-hello-no-saved-searches
index 7f8206aaffa1f97de82438a20ee838c8abac7633..7c09e40bcef121d778fcf72f7a1676269e7fcf93 100644 (file)
--- a/test/emacs.expected-output/notmuch-hello-no-saved-searches
+++ b/test/emacs.expected-output/notmuch-hello-no-saved-searches
@@ -1,6 +1,6 @@
    Welcome to notmuch. You have 50 messages.
 
-Search:                                                                     
+Search:                                                                      
 
 [Show all tags]
 

diff --git a/test/emacs.expected-output/notmuch-hello-with-empty b/test/emacs.expected-output/notmuch-hello-with-empty
index a9ed63044fd9ef3978cff9d5b8950292224414b8..2a267c92580a8c39979cbd7a5c6e4c515d38cb54 100644 (file)
--- a/test/emacs.expected-output/notmuch-hello-with-empty
+++ b/test/emacs.expected-output/notmuch-hello-with-empty
@@ -4,7 +4,7 @@ Saved searches: [edit]
 
          50 inbox           50 unread           0 empty     
 
-Search:                                                                     
+Search:                                                                      
 
 [Show all tags]