Mercurial > emacs

diff lisp/misearch.el @ 106332:a620dcf767e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(multi-isearch-search-fun): Always provide a non-nil value `buffer' of `multi-isearch-next-buffer-current-function'. Use `(current-buffer)' when `buffer' is nil. (multi-isearch-next-buffer-from-list): Don't fallback to `(current-buffer)' when `buffer' is nil. (Bug#4947)
author Juri Linkov <juri@jurta.org>
date Mon, 30 Nov 2009 21:45:30 +0000
parents 1328c6aa3dec
children 1d1d5d9bd884
line wrap: on
line diff
--- a/lisp/misearch.el	Mon Nov 30 21:21:35 2009 +0000
+++ b/lisp/misearch.el	Mon Nov 30 21:45:30 2009 +0000
@@ -158,7 +158,7 @@
 		   (while (not found)
 		     ;; Find the next buffer to search
 		     (setq buffer (funcall multi-isearch-next-buffer-current-function
-					   buffer nil))
+					   (or buffer (current-buffer)) nil))
 		     (with-current-buffer buffer
 		       (goto-char (if isearch-forward (point-min) (point-max)))
 		       (setq isearch-barrier (point) isearch-opoint (point))
@@ -222,7 +222,7 @@
 		   (reverse multi-isearch-buffer-list))))
     (if wrap
 	(car buffers)
-      (cadr (member (or buffer (current-buffer)) buffers)))))
+      (cadr (member buffer buffers)))))
 
 (defun multi-isearch-read-buffers ()
   "Return a list of buffers specified interactively, one by one."