[Emacs-diffs] /srv/bzr/emacs/trunk r106432: * lisp/isearch.el (isearch-edit-string): Let-bind `history-add-new-input'

[Juri Linkov]

------------------------------------------------------------
revno: 106432
fixes bug(s): http://debbugs.gnu.org/9185
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Sat 2011-11-19 21:59:37 +0200
message:
  * lisp/isearch.el (isearch-edit-string): Let-bind `history-add-new-input'
  to nil instead of binding `search-ring' and `regexp-search-ring'.
modified:
  lisp/ChangeLog
  lisp/isearch.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-11-19 19:49:56 +0000
+++ b/lisp/ChangeLog    2011-11-19 19:59:37 +0000
@@ -1,3 +1,9 @@
+2011-11-19  Juri Linkov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * simple.el (line-move): Force movement by logical lines for any

=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el   2011-11-15 17:37:37 +0000
+++ b/lisp/isearch.el   2011-11-19 19:59:37 +0000
@@ -1162,11 +1162,10 @@
 
          (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))