# HG changeset patch # User Juri Linkov # Date 1259617530 0 # Node ID a620dcf767e8ce7b75e9d4d389d51306b1a7ac59 # Parent 1c9648ddfd5e3c23d7a8c9857d875729f40b6693 (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) diff -r 1c9648ddfd5e -r a620dcf767e8 lisp/ChangeLog --- a/lisp/ChangeLog Mon Nov 30 21:21:35 2009 +0000 +++ b/lisp/ChangeLog Mon Nov 30 21:45:30 2009 +0000 @@ -4,6 +4,14 @@ 2009-11-30 Juri Linkov + * misearch.el (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) + +2009-11-30 Juri Linkov + * misearch.el (multi-isearch-read-buffers): Move canonicalization of buffers with `get-buffer' to `multi-isearch-buffers'. (multi-isearch-buffers, multi-isearch-buffers-regexp): diff -r 1c9648ddfd5e -r a620dcf767e8 lisp/misearch.el --- 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."