diff options
| author | Juri Linkov <juri@jurta.org> | 2008-07-23 23:51:15 +0000 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2008-07-23 23:51:15 +0000 |
| commit | 3c0aa5e65b9dd3fb38ce095683423b072e42c1bd (patch) | |
| tree | c231e4189465f50b143cfcbf3a526469f0f4ffb0 /lisp/isearch.el | |
| parent | 29d2a698f87f091846051fc6eeb9528c8e25fb9c (diff) | |
| download | emacs-3c0aa5e65b9dd3fb38ce095683423b072e42c1bd.tar.gz | |
(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'.
Diffstat (limited to 'lisp/isearch.el')
| -rw-r--r-- | lisp/isearch.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el index 130685fb882..2deb90e2f56 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -2111,6 +2111,7 @@ If there is no completion possible, say so and continue searching." (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 @@ Can be changed via `isearch-search-fun-function' for special needs." (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)) |