diff options
| author | Juri Linkov <juri@linkov.net> | 2021-05-09 22:27:08 +0300 |
|---|---|---|
| committer | Juri Linkov <juri@linkov.net> | 2021-05-09 22:27:08 +0300 |
| commit | 25c775b4e964aaa2cbf17997c0479dfc2ecf33e2 (patch) | |
| tree | 38736a9f82b8e11cab42d6ffbcd63d4427bfe410 /lisp/isearch.el | |
| parent | 3d2c892114ebd35cb10928bb87f991316a0ca55c (diff) | |
| download | emacs-25c775b4e964aaa2cbf17997c0479dfc2ecf33e2.tar.gz emacs-25c775b4e964aaa2cbf17997c0479dfc2ecf33e2.tar.bz2 emacs-25c775b4e964aaa2cbf17997c0479dfc2ecf33e2.zip | |
* lisp/misearch.el (multi-isearch-switch-buffer): New function.
* lisp/isearch.el (isearch-search-string):
* lisp/misearch.el (multi-isearch-wrap, multi-isearch-pop-state): Use it.
https://lists.gnu.org/archive/html/emacs-devel/2021-05/msg00309.html
Diffstat (limited to 'lisp/isearch.el')
| -rw-r--r-- | lisp/isearch.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el index 9f3cfd70fb3..536c76ea5df 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -3506,9 +3506,8 @@ Optional third argument, if t, means if fail just return nil (no error). (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 multi-isearch-next-buffer-current-function - (buffer-live-p multi-isearch-current-buffer)) - (switch-to-buffer multi-isearch-current-buffer)) + (when multi-isearch-next-buffer-current-function + (multi-isearch-switch-buffer)) (goto-char pos1) pos1))) |