From 05a40373215e7995aec79d1b3b426a2d4504f67b Mon Sep 17 00:00:00 2001 From: Karl Heuer Date: Thu, 10 Sep 1998 16:00:20 +0000 Subject: [PATCH] (dired-mark-files-containing-regexp): Don't scan directories. Ignore non-readable files. --- lisp/dired.el | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/lisp/dired.el b/lisp/dired.el index b5b3b8fc078..4218f1050c4 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -2165,19 +2165,21 @@ A prefix argument means to unmark them instead. (and (not (looking-at dired-re-dot)) (not (eolp)) ; empty line (let ((fn (dired-get-filename nil t))) - (and fn (let ((prebuf (get-file-buffer fn))) - (message "Checking %s" fn) - ;; For now we do it inside emacs - ;; Grep might be better if there are a lot of files - (if prebuf - (with-current-buffer prebuf - (save-excursion - (goto-char (point-min)) - (re-search-forward regexp nil t))) - (with-temp-buffer - (insert-file-contents fn) - (goto-char (point-min)) - (re-search-forward regexp nil t)))) + (when (and fn (file-readable-p fn) + (not (file-directory-p fn))) + (let ((prebuf (get-file-buffer fn))) + (message "Checking %s" fn) + ;; For now we do it inside emacs + ;; Grep might be better if there are a lot of files + (if prebuf + (with-current-buffer prebuf + (save-excursion + (goto-char (point-min)) + (re-search-forward regexp nil t))) + (with-temp-buffer + (insert-file-contents fn) + (goto-char (point-min)) + (re-search-forward regexp nil t)))) ))) "matching file"))) -- 2.39.2