emacs: polish notmuch-hello help text

[notmuch] / emacs / notmuch-hello.el

diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 1a61768d50d4c6f4c07827c8bff4f34fdc0f133c..d17a30f91e0c830dc3e394c97ff48b666401936d 100644 (file)
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -29,11 +29,8 @@
 (declare-function notmuch-search "notmuch" (query &optional oldest-first target-thread target-line continuation))
 (declare-function notmuch-poll "notmuch" ())
 
-(defvar notmuch-hello-search-bar-marker nil
-  "The position of the search bar within the notmuch-hello buffer.")
-
-(defcustom notmuch-recent-searches-max 10
-  "The number of recent searches to store and display."
+(defcustom notmuch-hello-recent-searches-max 10
+  "The number of recent searches to display."
   :type 'integer
   :group 'notmuch-hello)
 
@@ -157,16 +154,6 @@ International Bureau of Weights and Measures."
 (defvar notmuch-hello-url "http://notmuchmail.org"
   "The `notmuch' web site.")
 
-(defvar notmuch-hello-recent-searches nil)
-
-(defun notmuch-hello-remember-search (search)
-  (setq notmuch-hello-recent-searches
-       (delete search notmuch-hello-recent-searches))
-  (push search notmuch-hello-recent-searches)
-  (if (> (length notmuch-hello-recent-searches)
-        notmuch-recent-searches-max)
-      (setq notmuch-hello-recent-searches (butlast notmuch-hello-recent-searches))))
-
 (defun notmuch-hello-nice-number (n)
   (let (result)
     (while (> n 0)
@@ -185,10 +172,14 @@ International Bureau of Weights and Measures."
       (match-string 1 search)
     search))
 
-(defun notmuch-hello-search (search)
-  (let ((search (notmuch-hello-trim search)))
-    (notmuch-hello-remember-search search)
-    (notmuch-search search notmuch-search-oldest-first nil nil #'notmuch-hello-search-continuation)))
+(defun notmuch-hello-search (&optional search)
+  (interactive)
+  (unless (null search)
+    (setq search (notmuch-hello-trim search))
+    (let ((history-delete-duplicates t))
+      (add-to-history 'notmuch-search-history search)))
+  (notmuch-search search notmuch-search-oldest-first nil nil
+                 #'notmuch-hello-search-continuation))
 
 (defun notmuch-hello-add-saved-search (widget)
   (interactive)
@@ -324,11 +315,6 @@ should be. Returns a cons cell `(tags-per-line width)'."
       (widget-insert "\n"))
     found-target-pos))
 
-(defun notmuch-hello-goto-search ()
-  "Put point inside the `search' widget."
-  (interactive)
-  (goto-char notmuch-hello-search-bar-marker))
-
 (defimage notmuch-hello-logo ((:type png :file "notmuch-logo.png")))
 
 (defun notmuch-hello-search-continuation()
@@ -358,7 +344,7 @@ should be. Returns a cons cell `(tags-per-line width)'."
     (define-key map "G" 'notmuch-hello-poll-and-update)
     (define-key map (kbd "<C-tab>") 'widget-backward)
     (define-key map "m" 'notmuch-mua-new-mail)
-    (define-key map "s" 'notmuch-hello-goto-search)
+    (define-key map "s" 'notmuch-hello-search)
     map)
   "Keymap for \"notmuch hello\" buffers.")
 (fset 'notmuch-hello-mode-map notmuch-hello-mode-map)
@@ -402,8 +388,8 @@ Complete list of currently available key bindings:
   "Run notmuch and display saved searches, known tags, etc."
   (interactive)
 
-  ; Jump through a hoop to get this value from the deprecated variable
-  ; name (`notmuch-folders') or from the default value.
+  ;; Jump through a hoop to get this value from the deprecated variable
+  ;; name (`notmuch-folders') or from the default value.
   (unless notmuch-saved-searches
     (setq notmuch-saved-searches (notmuch-saved-searches)))
 
@@ -471,7 +457,8 @@ Complete list of currently available key bindings:
       (widget-insert " messages.\n"))
 
     (let ((found-target-pos nil)
-         (final-target-pos nil))
+         (final-target-pos nil)
+         (default-pos))
       (let* ((saved-alist
              ;; Filter out empty saved searches if required.
              (if notmuch-show-empty-saved-searches
@@ -503,7 +490,7 @@ Complete list of currently available key bindings:
            (indent-rigidly start (point) notmuch-hello-indent)))
 
        (widget-insert "\nSearch: ")
-       (setq notmuch-hello-search-bar-marker (point-marker))
+       (setq default-pos (point-marker))
        (widget-create 'editable-field
                       ;; Leave some space at the start and end of the
                       ;; search boxes.
@@ -520,18 +507,18 @@ Complete list of currently available key bindings:
        (put-text-property (1- (point)) (point) 'invisible t)
        (widget-insert "\n")
 
-       (when notmuch-hello-recent-searches
+       (when notmuch-search-history
          (widget-insert "\nRecent searches: ")
          (widget-create 'push-button
                         :notify (lambda (&rest ignore)
-                                  (setq notmuch-hello-recent-searches nil)
+                                  (setq notmuch-search-history nil)
                                   (notmuch-hello-update))
                         "clear")
          (widget-insert "\n\n")
-         (let ((start (point))
-               (nth 0))
-           (mapc (lambda (search)
-                   (let ((widget-symbol (intern (format "notmuch-hello-search-%d" nth))))
+         (let ((start (point)))
+           (loop for i from 1 to notmuch-hello-recent-searches-max
+                 for search in notmuch-search-history do
+                   (let ((widget-symbol (intern (format "notmuch-hello-search-%d" i))))
                      (set widget-symbol
                           (widget-create 'editable-field
                                          ;; Don't let the search boxes be
@@ -558,9 +545,7 @@ Complete list of currently available key bindings:
                                               (notmuch-hello-add-saved-search widget))
                                     :notmuch-saved-search-widget widget-symbol
                                     "save"))
-                   (widget-insert "\n")
-                   (setq nth (1+ nth)))
-                 notmuch-hello-recent-searches)
+                   (widget-insert "\n"))
            (indent-rigidly start (point) notmuch-hello-indent)))
 
        (when alltags-alist
@@ -589,13 +574,13 @@ Complete list of currently available key bindings:
       (let ((start (point)))
        (widget-insert "\n\n")
        (widget-insert "Type a search query and hit RET to view matching threads.\n")
-       (when notmuch-hello-recent-searches
+       (when notmuch-search-history
          (widget-insert "Hit RET to re-submit a previous search. Edit it first if you like.\n")
          (widget-insert "Save recent searches with the `save' button.\n"))
        (when notmuch-saved-searches
          (widget-insert "Edit saved searches with the `edit' button.\n"))
        (widget-insert "Hit RET or click on a saved search or tag name to view matching threads.\n")
-       (widget-insert "`=' refreshes this screen. `s' jumps to the search box. `q' to quit.\n")
+       (widget-insert "`=' to refresh this screen. `s' to search messages. `q' to quit.\n")
        (let ((fill-column (- (window-width) notmuch-hello-indent)))
          (center-region start (point))))
 
@@ -607,7 +592,7 @@ Complete list of currently available key bindings:
          (widget-forward 1)))
 
       (unless (widget-at)
-       (notmuch-hello-goto-search))))
+       (goto-char default-pos))))
 
   (run-hooks 'notmuch-hello-refresh-hook))