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

[Juri Linkov]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juri Linkov <jurta>     09/11/30 20:27:48

Modified files:
        lisp           : ChangeLog misearch.el 

Log message:
        (multi-isearch-read-buffers): Move canonicalization
        of buffers with `get-buffer' to `multi-isearch-buffers'.
        (multi-isearch-buffers, multi-isearch-buffers-regexp):
        Canonicalize BUFFERS with `get-buffer'.  Doc fix.
        (multi-isearch-files, multi-isearch-files-regexp): Canonicalize
        FILES with `expand-file-name' converting relative file names
        to absolute.  Doc fix.  (Bug#4727)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16772&r2=1.16773
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/misearch.el?cvsroot=emacs&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16772
retrieving revision 1.16773
diff -u -b -r1.16772 -r1.16773
--- ChangeLog   30 Nov 2009 19:43:48 -0000      1.16772
+++ ChangeLog   30 Nov 2009 20:27:44 -0000      1.16773
@@ -1,5 +1,15 @@
 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):
+       Canonicalize BUFFERS with `get-buffer'.  Doc fix.
+       (multi-isearch-files, multi-isearch-files-regexp): Canonicalize
+       FILES with `expand-file-name' converting relative file names
+       to absolute.  Doc fix.  (Bug#4727)
+
+2009-11-30  Juri Linkov  <address@hidden>
+
        * misearch.el (multi-isearch-read-buffers)
        (multi-isearch-read-matching-buffers): New functions.
        (multi-isearch-buffers, multi-isearch-buffers-regexp):

Index: misearch.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/misearch.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- misearch.el 30 Nov 2009 19:43:51 -0000      1.5
+++ misearch.el 30 Nov 2009 20:27:48 -0000      1.6
@@ -240,7 +240,7 @@
                 ""))
       (add-to-list 'bufs buf)
       (setq ido-ignore-item-temp-list bufs))
-    (nreverse (mapcar #'get-buffer bufs))))
+    (nreverse bufs)))
 
 (defun multi-isearch-read-matching-buffers ()
   "Return a list of buffers whose names match specified regexp."
@@ -257,6 +257,7 @@
 ;;;###autoload
 (defun multi-isearch-buffers (buffers)
   "Start multi-buffer Isearch on a list of BUFFERS.
+This list can contain live buffers or their names.
 Interactively read buffer names to search, one by one, ended with RET.
 With a prefix argument, ask for a regexp, and search in buffers
 whose names match the specified regexp."
@@ -266,14 +267,15 @@
           (multi-isearch-read-buffers))))
   (let ((multi-isearch-next-buffer-function
         'multi-isearch-next-buffer-from-list)
-       (multi-isearch-buffer-list buffers))
-    (switch-to-buffer (car buffers))
+       (multi-isearch-buffer-list (mapcar #'get-buffer buffers)))
+    (switch-to-buffer (car multi-isearch-buffer-list))
     (goto-char (if isearch-forward (point-min) (point-max)))
     (isearch-forward)))
 
 ;;;###autoload
 (defun multi-isearch-buffers-regexp (buffers)
   "Start multi-buffer regexp Isearch on a list of BUFFERS.
+This list can contain live buffers or their names.
 Interactively read buffer names to search, one by one, ended with RET.
 With a prefix argument, ask for a regexp, and search in buffers
 whose names match the specified regexp."
@@ -283,8 +285,8 @@
           (multi-isearch-read-buffers))))
   (let ((multi-isearch-next-buffer-function
         'multi-isearch-next-buffer-from-list)
-       (multi-isearch-buffer-list buffers))
-    (switch-to-buffer (car buffers))
+       (multi-isearch-buffer-list (mapcar #'get-buffer buffers)))
+    (switch-to-buffer (car multi-isearch-buffer-list))
     (goto-char (if isearch-forward (point-min) (point-max)))
     (isearch-forward-regexp)))
 
@@ -338,6 +340,8 @@
 ;;;###autoload
 (defun multi-isearch-files (files)
   "Start multi-buffer Isearch on a list of FILES.
+Relative file names in this list are expanded to absolute
+file names using the current buffer's value of `default-directory'.
 Interactively read file names to search, one by one, ended with RET.
 With a prefix argument, ask for a wildcard, and search in file buffers
 whose file names match the specified wildcard."
@@ -347,14 +351,16 @@
           (multi-isearch-read-files))))
   (let ((multi-isearch-next-buffer-function
         'multi-isearch-next-file-buffer-from-list)
-       (multi-isearch-file-list files))
-    (find-file (car files))
+       (multi-isearch-file-list (mapcar #'expand-file-name files)))
+    (find-file (car multi-isearch-file-list))
     (goto-char (if isearch-forward (point-min) (point-max)))
     (isearch-forward)))
 
 ;;;###autoload
 (defun multi-isearch-files-regexp (files)
   "Start multi-buffer regexp Isearch on a list of FILES.
+Relative file names in this list are expanded to absolute
+file names using the current buffer's value of `default-directory'.
 Interactively read file names to search, one by one, ended with RET.
 With a prefix argument, ask for a wildcard, and search in file buffers
 whose file names match the specified wildcard."
@@ -364,8 +370,8 @@
           (multi-isearch-read-files))))
   (let ((multi-isearch-next-buffer-function
         'multi-isearch-next-file-buffer-from-list)
-       (multi-isearch-file-list files))
-    (find-file (car files))
+       (multi-isearch-file-list (mapcar #'expand-file-name files)))
+    (find-file (car multi-isearch-file-list))
     (goto-char (if isearch-forward (point-min) (point-max)))
     (isearch-forward-regexp)))