diff options
| author | Juri Linkov <juri@jurta.org> | 2011-08-25 23:32:54 +0300 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2011-08-25 23:32:54 +0300 |
| commit | 93eb7113267c5b51904d36084f9a61b7c75313e4 (patch) | |
| tree | c8bcdd1eaab49f63cea30457bc8d419e87184eec /lisp/isearch.el | |
| parent | f65d1611ff6ec028625ab44bc4974e1a8945e2d5 (diff) | |
| download | emacs-93eb7113267c5b51904d36084f9a61b7c75313e4.tar.gz | |
* lisp/isearch.el (isearch-edit-string): Let-bind `search-ring' and
`regexp-search-ring' to their global values to protect from
updating by `read-from-minibuffer'.
Fixes: debbugs:9185
Diffstat (limited to 'lisp/isearch.el')
| -rw-r--r-- | lisp/isearch.el | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el index 7fcc31f188f..12529857a2c 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -1132,6 +1132,14 @@ If first char entered is \\[isearch-yank-word-or-char], then do word search inst ;; Save current configuration so we can restore it here. (isearch-window-configuration (current-window-configuration)) + ;; This could protect the index of the search rings, + ;; but we can't reliably count the number of typed M-p + ;; in `read-from-minibuffer' to adjust the index accordingly. + ;; So when the following is commented out, `isearch-mode' + ;; below resets the index to the predictable value nil. + ;; (search-ring-yank-pointer search-ring-yank-pointer) + ;; (regexp-search-ring-yank-pointer regexp-search-ring-yank-pointer) + ;; Temporarily restore `minibuffer-message-timeout'. (minibuffer-message-timeout isearch-original-minibuffer-message-timeout) @@ -1152,13 +1160,18 @@ If first char entered is \\[isearch-yank-word-or-char], then do word search inst (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) ;; Binding minibuffer-history-symbol to nil is a work-around ;; for some incompatibility with gmhist. (minibuffer-history-symbol)) (setq isearch-new-string (read-from-minibuffer (isearch-message-prefix nil nil isearch-nonincremental) - (cons isearch-string (1+ (isearch-fail-pos))) + (cons isearch-string (1+ (isearch-fail-pos))) minibuffer-local-isearch-map nil (if isearch-regexp (cons 'regexp-search-ring |