From 5e514c27128adafc57921e13f529e591f606d882 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Fri, 29 Mar 2002 14:45:05 +0000 Subject: [PATCH] (dired-do-query-replace-regexp, dired-do-search): Use FILTER arg in dired-get-marked-files to exclude directories. (dired-nondirectory-p): New function. --- lisp/ChangeLog | 10 ++++++++-- lisp/dired-aux.el | 8 ++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2559eb3dee0..773ffc385a9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -8,11 +8,17 @@ 2002-03-29 Simon Marshall - * 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 + * 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 diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 8e4a8e0ded9..855deb2702c 100644 --- 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))) ;;;###autoload (defun dired-show-file-type (file &optional deref-symlinks) -- 2.39.2