(dired-do-query-replace-regexp, dired-do-search):

Use FILTER arg in dired-get-marked-files to exclude directories.
(dired-nondirectory-p): New function.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2559eb3dee0d9fae069a5a5514890cc7cf0594ae..773ffc385a919de8c0ce01218ff177b58a666c47 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -8,11 +8,17 @@
 
 2002-03-29  Simon Marshall  <simon.marshall@misys.com>
 
-       * font-lock.el (save-buffer-state): Use make-symbol to bind
-       `modified'.
+       * font-lock.el (save-buffer-state): Use make-symbol to bind `modified'.
 
 2002-03-29  Richard M. Stallman  <rms@gnu.org>
 
+       * dired-aux.el (dired-do-query-replace-regexp, dired-do-search): 
+       Use FILTER arg in dired-get-marked-files to exclude directories.
+       (dired-nondirectory-p): New function.
+
+       * dired.el (dired-get-marked-files): New arg FILTER
+       allows selection of some files.
+
        * progmodes/tcl.el (tcl-imenu-create-index-function): Doc fix.
 
 2002-03-29  Eric M. Ludlam  <eric@siege-engine.com>

diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 8e4a8e0ded995cdcbc98abe9c27ae873f2520fa5..855deb2702cf5b1e46547b45f2efbf5dcde0a6cf 100644 (file)
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1993,7 +1993,7 @@ Use \\[dired-hide-subdir] to (un)hide a particular subdirectory."
 Stops when a match is found.
 To continue searching for next match, use command \\[tags-loop-continue]."
   (interactive "sSearch marked files (regexp): ")
-  (tags-search regexp '(dired-get-marked-files)))
+  (tags-search regexp '(dired-get-marked-files nil nil 'dired-nondirectory-p)))
 
 ;;;###autoload
 (defun dired-do-query-replace-regexp (from to &optional delimited)
@@ -2003,7 +2003,11 @@ If you exit (\\[keyboard-quit], RET or q), you can resume the query replace
 with the command \\[tags-loop-continue]."
   (interactive
    "sQuery replace in marked files (regexp): \nsQuery replace %s by: \nP")
-  (tags-query-replace from to delimited '(dired-get-marked-files)))
+  (tags-query-replace from to delimited
+                     '(dired-get-marked-files nil nil 'dired-nondirectory-p)))
+
+(defun dired-nondirectory-p (file)
+  (not (file-directory-p file)))
 \f
 ;;;###autoload
 (defun dired-show-file-type (file &optional deref-symlinks)