From: Juri Linkov <juri@jurta.org>
Date: Sun, 28 Oct 2007 14:49:41 +0000 (+0000)
Subject: (isearch-other-meta-char): Call `isearch-edit-string' when mouse is
X-Git-Tag: emacs-pretest-23.0.90~10018
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=72a69d7f8170f7224f98205e32ccf488563e28e9;p=emacs.git

(isearch-other-meta-char): Call `isearch-edit-string' when mouse is
clicked on the isearch message.
(isearch-resume): Call `isearch-update' at the end.  Rename argument
`search' to `string' to conform to the isearch terminology.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 27fe92bad28..3a87e527307 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-28  Juri Linkov  <juri@jurta.org>
+
+	* isearch.el (isearch-other-meta-char): Call `isearch-edit-string'
+	when mouse is clicked on the isearch message.
+	(isearch-resume): Call `isearch-update' at the end.
+	Rename argument `search' to `string' to conform to the
+	isearch terminology.
+
 2007-10-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	Rewrite abbrev.c in Elisp.
diff --git a/lisp/isearch.el b/lisp/isearch.el
index c9a4cf45664..afc9ee2036a 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1738,6 +1738,12 @@ Isearch mode."
                  (isearch-back-into-window (eq ab-bel 'above) isearch-point)
                (goto-char isearch-point)))
            (isearch-update))
+	  ;; A mouse click on the isearch message starts editing the search string
+	  ((and (eq (car-safe main-event) 'down-mouse-1)
+		(window-minibuffer-p (posn-window (event-start main-event))))
+	   ;; Swallow the up-event.
+	   (read-event)
+	   (isearch-edit-string))
 	  (search-exit-option
 	   (let (window)
              (isearch-unread-key-sequence keylist)
@@ -2499,19 +2505,20 @@ Attempt to do the search exactly the way the pending isearch would."
 		    (run-at-time lazy-highlight-interval nil
 				 'isearch-lazy-highlight-update)))))))))
 
-(defun isearch-resume (search regexp word forward message case-fold)
+(defun isearch-resume (string regexp word forward message case-fold)
   "Resume an incremental search.
-SEARCH is the string or regexp searched for.
+STRING is the string or regexp searched for.
 REGEXP non-nil means the resumed search was a regexp search.
 WORD non-nil means resume a word search.
 FORWARD non-nil means resume a forward search.
 MESSAGE is the echo-area message recorded for the search resumed.
 CASE-FOLD non-nil means the search was case-insensitive."
   (isearch-mode forward regexp nil nil word)
-  (setq isearch-string search
+  (setq isearch-string string
 	isearch-message message
 	isearch-case-fold-search case-fold)
-  (isearch-search))
+  (isearch-search)
+  (isearch-update))
 
 ;; arch-tag: 74850515-f7d8-43a6-8a2c-ca90a4c1e675
 ;;; isearch.el ends here