From: Juri Linkov <juri@jurta.org>
Date: Sat, 19 Nov 2011 19:59:37 +0000 (+0200)
Subject: * lisp/isearch.el (isearch-edit-string): Let-bind `history-add-new-input'
X-Git-Tag: emacs-pretest-24.0.92~129
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=df754f6672e953b309538ad1ded72d2f3300f215;p=emacs.git

* lisp/isearch.el (isearch-edit-string): Let-bind `history-add-new-input'
to nil instead of binding `search-ring' and `regexp-search-ring'.

Fixes: debbugs:9185
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 86a6c1c3754..46245ba6090 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-19  Juri Linkov  <juri@jurta.org>
+
+	* isearch.el (isearch-edit-string): Let-bind `history-add-new-input'
+	to nil instead of binding `search-ring' and `regexp-search-ring'.
+	(Bug#9185)
+
 2011-11-19  Eli Zaretskii  <eliz@gnu.org>
 
 	* simple.el (line-move): Force movement by logical lines for any
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 977de6ac4b0..07ae56934b5 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1162,11 +1162,10 @@ The following additional command keys are active while editing.
 
 	  (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)
+		     ;; Don't add a new search string to the search ring here
+		     ;; in `read-from-minibuffer'. It should be added only
+		     ;; by `isearch-update-ring' called from `isearch-done'.
+		     (history-add-new-input nil)
 		     ;; Binding minibuffer-history-symbol to nil is a work-around
 		     ;; for some incompatibility with gmhist.
 		     (minibuffer-history-symbol))