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

[Juri Linkov]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juri Linkov <jurta>     09/11/30 19:43:51

Modified files:
        etc            : NEWS 
        lisp           : ChangeLog misearch.el 

Log message:
        (multi-isearch-read-buffers)
        (multi-isearch-read-matching-buffers): New functions.
        (multi-isearch-buffers, multi-isearch-buffers-regexp):
        Use them in the `interactive' spec.  Doc fix.
        (multi-isearch-read-files, multi-isearch-read-matching-files):
        New functions.
        (multi-isearch-files, multi-isearch-files-regexp):
        Use them in the `interactive' spec.  Doc fix.  (Bug#4725)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/etc/NEWS?cvsroot=emacs&r1=1.2130&r2=1.2131
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16771&r2=1.16772
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/misearch.el?cvsroot=emacs&r1=1.4&r2=1.5

Patches:
Index: etc/NEWS
===================================================================
RCS file: /sources/emacs/emacs/etc/NEWS,v
retrieving revision 1.2130
retrieving revision 1.2131
diff -u -b -r1.2130 -r1.2131
--- etc/NEWS    30 Nov 2009 16:14:48 -0000      1.2130
+++ etc/NEWS    30 Nov 2009 19:42:16 -0000      1.2131
@@ -304,6 +304,14 @@
 and `comint-history-isearch-backward-regexp' (bound to M-r) start Isearch
 in the input history regardless of the value of `comint-history-isearch'.
 
+*** Interactively `multi-isearch-buffers' and `multi-isearch-buffers-regexp'
+read buffer names to search, one by one, ended with RET.  With a prefix
+argument, they ask for a regexp, and search in buffers whose names match
+the specified regexp.  Interactively `multi-isearch-files' and
+`multi-isearch-files-regexp' read file names to search, one by one,
+ended with RET.  With a prefix argument, they ask for a wildcard, and
+search in file buffers whose file names match the specified wildcard.
+
 +++
 *** Autorevert Tail mode now works also for remote files.
 

Index: lisp/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16771
retrieving revision 1.16772
diff -u -b -r1.16771 -r1.16772
--- lisp/ChangeLog      30 Nov 2009 16:15:20 -0000      1.16771
+++ lisp/ChangeLog      30 Nov 2009 19:43:48 -0000      1.16772
@@ -1,5 +1,16 @@
 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):
+       Use them in the `interactive' spec.  Doc fix.
+       (multi-isearch-read-files, multi-isearch-read-matching-files):
+       New functions.
+       (multi-isearch-files, multi-isearch-files-regexp):
+       Use them in the `interactive' spec.  Doc fix.  (Bug#4725)
+
+2009-11-30  Juri Linkov  <address@hidden>
+
        * doc-view.el (doc-view-continuous):
        Rename from `doc-view-continuous-mode'.
        (doc-view-menu): Move "Toggle display" to the top.

Index: lisp/misearch.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/misearch.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- lisp/misearch.el    14 Oct 2009 21:51:45 -0000      1.4
+++ lisp/misearch.el    30 Nov 2009 19:43:51 -0000      1.5
@@ -224,9 +224,46 @@
        (car buffers)
       (cadr (member (or buffer (current-buffer)) buffers)))))
 
+(defun multi-isearch-read-buffers ()
+  "Return a list of buffers specified interactively, one by one."
+  ;; Most code from `multi-occur'.
+  (let* ((bufs (list (read-buffer "First buffer to search: "
+                                 (current-buffer) t)))
+        (buf nil)
+        (ido-ignore-item-temp-list bufs))
+    (while (not (string-equal
+                (setq buf (read-buffer
+                           (if (eq read-buffer-function 'ido-read-buffer)
+                               "Next buffer to search (C-j to end): "
+                             "Next buffer to search (RET to end): ")
+                           nil t))
+                ""))
+      (add-to-list 'bufs buf)
+      (setq ido-ignore-item-temp-list bufs))
+    (nreverse (mapcar #'get-buffer bufs))))
+
+(defun multi-isearch-read-matching-buffers ()
+  "Return a list of buffers whose names match specified regexp."
+  ;; Most code from `multi-occur-in-matching-buffers'
+  ;; and `kill-matching-buffers'.
+  (let ((bufregexp
+        (read-regexp "Search in buffers whose names match regexp")))
+    (when bufregexp
+      (delq nil (mapcar (lambda (buf)
+                         (when (string-match bufregexp (buffer-name buf))
+                           buf))
+                       (buffer-list))))))
+
 ;;;###autoload
 (defun multi-isearch-buffers (buffers)
-  "Start multi-buffer Isearch on a list of BUFFERS."
+  "Start multi-buffer Isearch on a list of BUFFERS.
+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."
+  (interactive
+   (list (if current-prefix-arg
+            (multi-isearch-read-matching-buffers)
+          (multi-isearch-read-buffers))))
   (let ((multi-isearch-next-buffer-function
         'multi-isearch-next-buffer-from-list)
        (multi-isearch-buffer-list buffers))
@@ -236,7 +273,14 @@
 
 ;;;###autoload
 (defun multi-isearch-buffers-regexp (buffers)
-  "Start multi-buffer regexp Isearch on a list of BUFFERS."
+  "Start multi-buffer regexp Isearch on a list of BUFFERS.
+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."
+  (interactive
+   (list (if current-prefix-arg
+            (multi-isearch-read-matching-buffers)
+          (multi-isearch-read-buffers))))
   (let ((multi-isearch-next-buffer-function
         'multi-isearch-next-buffer-from-list)
        (multi-isearch-buffer-list buffers))
@@ -264,9 +308,43 @@
         (car files)
        (cadr (member (buffer-file-name buffer) files))))))
 
+(defun multi-isearch-read-files ()
+  "Return a list of files specified interactively, one by one."
+  ;; Most code from `multi-occur'.
+  (let* ((files (list (read-file-name "First file to search: "
+                                     default-directory
+                                     buffer-file-name)))
+        (file nil))
+    (while (not (string-equal
+                (setq file (read-file-name
+                            "Next file to search (RET to end): "
+                            default-directory
+                            default-directory))
+                default-directory))
+      (add-to-list 'files file))
+    (nreverse files)))
+
+(defun multi-isearch-read-matching-files ()
+  "Return a list of files whose names match specified wildcard."
+  ;; Most wildcard code from `find-file-noselect'.
+  (let ((filename (read-regexp "Search in files whose names match wildcard")))
+    (when (and filename
+              (not (string-match "\\`/:" filename))
+              (string-match "[[*?]" filename))
+      (condition-case nil
+         (file-expand-wildcards filename t)
+       (error (list filename))))))
+
 ;;;###autoload
 (defun multi-isearch-files (files)
-  "Start multi-buffer Isearch on a list of FILES."
+  "Start multi-buffer Isearch on a list of FILES.
+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."
+  (interactive
+   (list (if current-prefix-arg
+            (multi-isearch-read-matching-files)
+          (multi-isearch-read-files))))
   (let ((multi-isearch-next-buffer-function
         'multi-isearch-next-file-buffer-from-list)
        (multi-isearch-file-list files))
@@ -276,7 +354,14 @@
 
 ;;;###autoload
 (defun multi-isearch-files-regexp (files)
-  "Start multi-buffer regexp Isearch on a list of FILES."
+  "Start multi-buffer regexp Isearch on a list of FILES.
+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."
+  (interactive
+   (list (if current-prefix-arg
+            (multi-isearch-read-matching-files)
+          (multi-isearch-read-files))))
   (let ((multi-isearch-next-buffer-function
         'multi-isearch-next-file-buffer-from-list)
        (multi-isearch-file-list files))