X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-hello.el;h=24e3133d8ae79f3099ddddcc4c90ffe8acdad258;hb=3ac2727dae9a703324982cdb2ac243f195c8c958;hp=033a30a93189e5e86a4e3575c16e152388b1e2bb;hpb=1c17dda5d5443aba22a115d0ac16d3e162c1a65f;p=notmuch

diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 033a30a9..24e3133d 100644
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -29,6 +29,9 @@
 (declare-function notmuch-search "notmuch" (query &optional oldest-first target-thread target-line continuation))
 (declare-function notmuch-folder-count "notmuch" (search))
 
+(defvar notmuch-hello-search-bar-marker nil
+  "The position of the search bar within the notmuch-hello buffer.")
+
 (defcustom notmuch-hello-recent-searches-max 10
   "The number of recent searches to store and display."
   :type 'integer
@@ -179,10 +182,9 @@ diagonal."
     found-target-pos))
 
 (defun notmuch-hello-goto-search ()
-  "Put point inside the `search' widget, which we know is first."
+  "Put point inside the `search' widget."
   (interactive)
-  (goto-char (point-min))
-  (widget-forward 3))
+  (goto-char notmuch-hello-search-bar-marker))
 
 (defimage notmuch-hello-logo ((:type png :file "notmuch-logo.png")))
 
@@ -248,61 +250,6 @@ diagonal."
 		   (car (process-lines notmuch-command "count")))
     (widget-insert " messages (that's not much mail).\n\n"))
 
-  (let ((start (point)))
-    (widget-insert "Search: ")
-    (widget-create 'editable-field
-		   ;; Leave some space at the start and end of the
-		   ;; search boxes.
-		   :size (max 8 (- (window-width) (* 2 notmuch-hello-indent)
-				   (length "Search: ")))
-		   :action (lambda (widget &rest ignore)
-			     (notmuch-hello-search (widget-value widget))))
-    (widget-insert "\n")
-    (indent-rigidly start (point) notmuch-hello-indent))
-
-  (when notmuch-hello-recent-searches
-    (widget-insert "\nRecent searches: ")
-    (widget-create 'push-button
-		   :notify (lambda (&rest ignore)
-			     (setq notmuch-hello-recent-searches 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))))
-		 (set widget-symbol
-		      (widget-create 'editable-field
-				     ;; Don't let the search boxes be
-				     ;; less than 8 characters wide.
-				     :size (max 8
-						(- (window-width)
-						   ;; Leave some space
-						   ;; at the start and
-						   ;; end of the
-						   ;; boxes.
-						   (* 2 notmuch-hello-indent)
-						   ;; 1 for the space
-						   ;; before the
-						   ;; `[save]' button. 6
-						   ;; for the `[save]'
-						   ;; button.
-						   1 6))
-				     :action (lambda (widget &rest ignore)
-					       (notmuch-hello-search (widget-value widget)))
-				     search))
-		 (widget-insert " ")
-		 (widget-create 'push-button
-				:notify (lambda (widget &rest ignore)
-					  (notmuch-hello-add-saved-search widget))
-				:notmuch-saved-search-widget widget-symbol
-				"save"))
-	       (widget-insert "\n")
-	       (setq nth (1+ nth)))
-	    notmuch-hello-recent-searches)
-      (indent-rigidly start (point) notmuch-hello-indent)))
-
   (let ((found-target-pos nil)
 	(final-target-pos nil))
     (let* ((saved-alist
@@ -319,18 +266,75 @@ diagonal."
 	   (widest (max saved-widest alltags-widest)))
 
       (when saved-alist
-	(widget-insert "\nSaved searches: ")
+	(widget-insert "Saved searches: ")
 	(widget-create 'push-button
 		       :notify (lambda (&rest ignore)
 				 (customize-variable 'notmuch-hello-saved-searches))
 		       "edit")
 	(widget-insert "\n\n")
+	(setq final-target-pos (point-marker))
 	(let ((start (point)))
 	  (setq found-target-pos (notmuch-hello-insert-tags saved-alist widest target))
-	  (if (not final-target-pos)
+	  (if found-target-pos
 	      (setq final-target-pos found-target-pos))
 	  (indent-rigidly start (point) notmuch-hello-indent)))
 
+      (let ((start (point)))
+	(widget-insert "\nSearch: ")
+	(setq notmuch-hello-search-bar-marker (point-marker))
+	(widget-create 'editable-field
+		       ;; Leave some space at the start and end of the
+		       ;; search boxes.
+		       :size (max 8 (- (window-width) (* 2 notmuch-hello-indent)
+				       (length "Search: ")))
+		       :action (lambda (widget &rest ignore)
+				 (notmuch-hello-search (widget-value widget))))
+	(widget-insert "\n")
+	(indent-rigidly start (point) notmuch-hello-indent))
+
+      (when notmuch-hello-recent-searches
+	(widget-insert "\nRecent searches: ")
+	(widget-create 'push-button
+		       :notify (lambda (&rest ignore)
+				 (setq notmuch-hello-recent-searches 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))))
+		     (set widget-symbol
+			  (widget-create 'editable-field
+					 ;; Don't let the search boxes be
+					 ;; less than 8 characters wide.
+					 :size (max 8
+						    (- (window-width)
+						       ;; Leave some space
+						       ;; at the start and
+						       ;; end of the
+						       ;; boxes.
+						       (* 2 notmuch-hello-indent)
+						       ;; 1 for the space
+						       ;; before the
+						       ;; `[save]' button. 6
+						       ;; for the `[save]'
+						       ;; button.
+						       1 6))
+					 :action (lambda (widget &rest ignore)
+						   (notmuch-hello-search (widget-value widget)))
+					 search))
+		     (widget-insert " ")
+		     (widget-create 'push-button
+				    :notify (lambda (widget &rest ignore)
+					      (notmuch-hello-add-saved-search widget))
+				    :notmuch-saved-search-widget widget-symbol
+				    "save"))
+		   (widget-insert "\n")
+		   (setq nth (1+ nth)))
+		notmuch-hello-recent-searches)
+	  (indent-rigidly start (point) notmuch-hello-indent)))
+
       (when alltags-alist
 	(widget-insert "\nAll tags:\n\n")
 	(let ((start (point)))
@@ -362,11 +366,9 @@ diagonal."
 
     (widget-setup)
 
-    (if final-target-pos
-	(goto-char final-target-pos)
-      (progn
-	(goto-char (point-min))
-	(widget-forward 1)))))
+    (goto-char final-target-pos)
+    (if (not (widget-at))
+	(widget-forward 1))))
 
 ;;