diff options
| author | Juri Linkov <juri@jurta.org> | 2011-11-19 21:59:37 +0200 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2011-11-19 21:59:37 +0200 |
| commit | df754f6672e953b309538ad1ded72d2f3300f215 (patch) | |
| tree | d3ebd9079ae557c65d35d175ae62321477896dfb | |
| parent | 0e23d96a60e4283caf112c0d06bb49a8a86ab2bf (diff) | |
| download | emacs-df754f6672e953b309538ad1ded72d2f3300f215.tar.gz | |
* 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
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/isearch.el | 9 |
2 files changed, 10 insertions, 5 deletions
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)) |