procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/isearch.el (isearch-edit-string): Let-bind `history-add-new-input'

Browse source 
to nil instead of binding `search-ring' and `regexp-search-ring'.

Fixes: debbugs:9185
This commit is contained in:
Juri Linkov 2011-11-19 21:59:37 +02:00
parent 0e23d96a60
commit df754f6672
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -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

9
lisp/isearch.el
View file

@ -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))