* 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 86a6c1c375408d93e79999008a639a1f7059afd6..46245ba6090fa8aa56fbb9e4ceb9109cf2f4b559 100644 (file)
--- 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 977de6ac4b013213598a91566aa5bd0aefba75a3..07ae56934b5c5572bba1bd1db8e38a78c5b43e13 100644 (file)
--- 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))