Mercurial > emacs
changeset 96952:db8569cf5705
(isearch-message-prefix): Display "Multi" when
`multi-isearch-next-buffer-current-function' is non-nil.
(isearch-search-string): Replace `isearch-buffers-next-buffer-function'
with `multi-isearch-next-buffer-current-function', and
`isearch-buffers-current-buffer' with `multi-isearch-current-buffer'.
| author | Juri Linkov <juri@jurta.org> |
|---|---|
| date | Wed, 23 Jul 2008 23:51:15 +0000 |
| parents | d446aa6e3dda |
| children | df8cf5e076d6 |
| files | lisp/isearch.el |
| diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/isearch.el Wed Jul 23 23:50:56 2008 +0000 +++ b/lisp/isearch.el Wed Jul 23 23:51:15 2008 +0000 @@ -2111,6 +2111,7 @@ (if isearch-wrapped "wrapped ") (if isearch-word "word " "") (if isearch-regexp "regexp " "") + (if multi-isearch-next-buffer-current-function "multi " "") (if nonincremental "search" "I-search") (if isearch-forward "" " backward") (if current-input-method @@ -2179,9 +2180,9 @@ (when pos1 ;; When using multiple buffers isearch, switch to the new buffer here, ;; because `save-excursion' above doesn't allow doing it inside funcall. - (if (and isearch-buffers-next-buffer-function - (buffer-live-p isearch-buffers-current-buffer)) - (switch-to-buffer isearch-buffers-current-buffer)) + (if (and multi-isearch-next-buffer-current-function + (buffer-live-p multi-isearch-current-buffer)) + (switch-to-buffer multi-isearch-current-buffer)) (goto-char pos1)) pos1))