From: Juri Linkov <juri@jurta.org>
Date: Thu, 25 Aug 2011 20:32:54 +0000 (+0300)
Subject: * lisp/isearch.el (isearch-edit-string): Let-bind `search-ring' and
X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~68^2~1
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=93eb7113267c5b51904d36084f9a61b7c75313e4;p=emacs.git

* lisp/isearch.el (isearch-edit-string): Let-bind `search-ring' and
`regexp-search-ring' to their global values to protect from
updating by `read-from-minibuffer'.

Fixes: debbugs:9185
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a98bdfd7709..b1d04b8c1b6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-25  Juri Linkov  <juri@jurta.org>
+
+	* isearch.el (isearch-edit-string): Let-bind `search-ring' and
+	`regexp-search-ring' to their global values to protect from
+	updating by `read-from-minibuffer' (bug#9185).
+
 2011-08-25  Juri Linkov  <juri@jurta.org>
 
 	* textmodes/ispell.el (ispell-command-loop): Add newline
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 7fcc31f188f..12529857a2c 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1132,6 +1132,14 @@ If first char entered is \\[isearch-yank-word-or-char], then do word search inst
 	      ;; Save current configuration so we can restore it here.
 	      (isearch-window-configuration (current-window-configuration))
 
+	      ;; This could protect the index of the search rings,
+	      ;; but we can't reliably count the number of typed M-p
+	      ;; in `read-from-minibuffer' to adjust the index accordingly.
+	      ;; So when the following is commented out, `isearch-mode'
+	      ;; below resets the index to the predictable value nil.
+	      ;; (search-ring-yank-pointer search-ring-yank-pointer)
+	      ;; (regexp-search-ring-yank-pointer regexp-search-ring-yank-pointer)
+
 	      ;; Temporarily restore `minibuffer-message-timeout'.
 	      (minibuffer-message-timeout
 	       isearch-original-minibuffer-message-timeout)
@@ -1152,13 +1160,18 @@ If first char entered is \\[isearch-yank-word-or-char], then do word search inst
 
 	  (unwind-protect
 	      (let* ((message-log-max nil)
+		     ;; Protect global value of search rings from updating
+		     ;; by `read-from-minibuffer'.  It should be updated only
+		     ;; by `isearch-update-ring' in `isearch-done', not here.
+		     (search-ring search-ring)
+		     (regexp-search-ring regexp-search-ring)
 		     ;; Binding minibuffer-history-symbol to nil is a work-around
 		     ;; for some incompatibility with gmhist.
 		     (minibuffer-history-symbol))
 		(setq isearch-new-string
                       (read-from-minibuffer
                        (isearch-message-prefix nil nil isearch-nonincremental)
-                        (cons isearch-string (1+ (isearch-fail-pos)))
+		       (cons isearch-string (1+ (isearch-fail-pos)))
                        minibuffer-local-isearch-map nil
                        (if isearch-regexp
 			   (cons 'regexp-search-ring