[Emacs-diffs] Changes to emacs/lisp/isearch.el,v

[Juri Linkov]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juri Linkov <jurta>     07/10/22 23:44:29

Index: isearch.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/isearch.el,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -b -r1.303 -r1.304
--- isearch.el  29 Aug 2007 05:28:05 -0000      1.303
+++ isearch.el  22 Oct 2007 23:44:29 -0000      1.304
@@ -2035,7 +2035,12 @@
                           (if isearch-forward (< pos2 pos1) (> pos2 pos1))))
              (setq pos1 pos2)
              (set-match-data match-data)))))
-    (if pos1
+    (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))
        (goto-char pos1))
     pos1))