[Emacs-diffs] emacs/lisp ChangeLog misearch.el

[Juri Linkov]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juri Linkov <jurta>     09/11/30 21:45:33

Modified files:
        lisp           : ChangeLog misearch.el 

Log message:
        (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)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16774&r2=1.16775
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/misearch.el?cvsroot=emacs&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16774
retrieving revision 1.16775
diff -u -b -r1.16774 -r1.16775
--- ChangeLog   30 Nov 2009 21:21:35 -0000      1.16774
+++ ChangeLog   30 Nov 2009 21:45:30 -0000      1.16775
@@ -4,6 +4,14 @@
 
 2009-11-30  Juri Linkov  <address@hidden>
 
+       * 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  <address@hidden>
+
        * misearch.el (multi-isearch-read-buffers): Move canonicalization
        of buffers with `get-buffer' to `multi-isearch-buffers'.
        (multi-isearch-buffers, multi-isearch-buffers-regexp):

Index: misearch.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/misearch.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- misearch.el 30 Nov 2009 20:27:48 -0000      1.6
+++ misearch.el 30 Nov 2009 21:45:33 -0000      1.7
@@ -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."