# HG changeset patch # User Karl Heuer # Date 905443220 0 # Node ID 6e0d3186be0dfbff6dfeb23aad8c81b86f804d64 # Parent 9c8df6d5d40d752affea013339757113ade29692 (dired-mark-files-containing-regexp): Don't scan directories. Ignore non-readable files. diff -r 9c8df6d5d40d -r 6e0d3186be0d lisp/dired.el --- a/lisp/dired.el Thu Sep 10 15:59:36 1998 +0000 +++ b/lisp/dired.el Thu Sep 10 16:00:20 1998 +0000 @@ -2165,19 +2165,21 @@ (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")))