* dired.el (dired-mark-files-regexp): Include any subdirectory components.

Fixes: debbugs:10445

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a907bd43f38386673f49896ea1466aea98a3e80d..fdbd28b1b6ad08f252b4ece841c81089d44f72d4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-27  Eduard Wiebe  <usenet@pusto.de>
+
+       * dired.el (dired-mark-files-regexp):
+       Include any subdirectory components.  (Bug#10445)
+
 2012-01-27  Mike Lamb  <mrlamb@gmail.com>  (tiny change)
 
        * pcmpl-unix.el (pcmpl-ssh-known-hosts):

diff --git a/lisp/dired.el b/lisp/dired.el
index b39e6e7c93cf4fe7c602af89113a6c102712a075..3962ef14aa42e2d3bb8b6b398e1c13252beaa29b 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3168,8 +3168,8 @@ object files--just `.o' will mark more than you might think."
     (dired-mark-if
      (and (not (looking-at dired-re-dot))
          (not (eolp))                  ; empty line
-         (let ((fn (dired-get-filename nil t)))
-           (and fn (string-match regexp (file-name-nondirectory fn)))))
+         (let ((fn (dired-get-filename t t)))
+           (and fn (string-match regexp fn))))
      "matching file")))
 
 (defun dired-mark-files-containing-regexp (regexp &optional marker-char)