aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Kurochkin <dmitry.kurochkin@gmail.com>2011-07-04 10:47:05 +0400
committerDavid Bremner <bremner@debian.org>2011-11-12 10:34:53 -0500
commite972d752c038b015b0af92de4ce1e00aa2557b71 (patch)
treec03edaeef242eb46ebb03ce680f557da9de90fb1
parenta2d78fba200d0342d90cf27f2ac3eb9091911275 (diff)
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.
-rw-r--r--emacs/notmuch-hello.el4
-rw-r--r--test/emacs.expected-output/notmuch-hello2
-rw-r--r--test/emacs.expected-output/notmuch-hello-no-saved-searches2
-rw-r--r--test/emacs.expected-output/notmuch-hello-with-empty2
4 files changed, 7 insertions, 3 deletions
diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 65fde75..1a76c30 100644
--- 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 64b7e42..48143bd 100644
--- 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 7f8206a..7c09e40 100644
--- 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 a9ed630..2a267c9 100644
--- 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]