# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1216857075 0
# Node ID db8569cf5705dc7c5c22bd612435b447f4331288
# Parent  d446aa6e3dda4978c21b39a9a608c38118d7f9ac
(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'.

diff -r d446aa6e3dda -r db8569cf5705 lisp/isearch.el
--- 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))