summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/dired.el4
2 files changed, 7 insertions, 2 deletions
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)