From: Eduard Wiebe <usenet@pusto.de>
Date: Fri, 27 Jan 2012 21:40:44 +0000 (-0800)
Subject: * dired.el (dired-mark-files-regexp): Include any subdirectory components.
X-Git-Tag: emacs-pretest-24.0.93~45
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fc4f7a233ec0e3bf4366f784e14b53e92bcc0241;p=emacs.git

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

Fixes: debbugs:10445
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a907bd43f38..fdbd28b1b6a 100644
--- 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 b39e6e7c93c..3962ef14aa4 100644
--- 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)