aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2011-06-18 16:17:30 -0400
committerChong Yidong2011-06-18 16:17:30 -0400
commitddb8b596be2a92a499310002e9f28abef012bfc2 (patch)
tree30f40fdbbf492636169faed8049f128149f69b81
parent770802895c7ae570e1161e0216d65abe0eea2893 (diff)
downloademacs-ddb8b596be2a92a499310002e9f28abef012bfc2.tar.gz
emacs-ddb8b596be2a92a499310002e9f28abef012bfc2.zip
* dired-x.el (dired-mark-unmarked-files): Fix interactive spec (Bug#8768).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/dired-x.el9
2 files changed, 11 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 61afa87201b..1d66ebe8039 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
12011-06-18 Chong Yidong <cyd@stupidchicken.com> 12011-06-18 Chong Yidong <cyd@stupidchicken.com>
2 2
3 * dired-x.el (dired-mark-unmarked-files): Fix interactive spec
4 (Bug#8768).
5
6 * replace.el (occur-mode-map): Set occur-edit-mode binding to "e".
7
3 * textmodes/fill.el (default-justification): Add :safe (Bug#8879). 8 * textmodes/fill.el (default-justification): Add :safe (Bug#8879).
4 9
5 * cus-face.el (custom-declare-face): Call custom-theme-recalc face 10 * cus-face.el (custom-declare-face): Call custom-theme-recalc face
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 548728cf28d..ca89d07ea7f 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -546,11 +546,14 @@ This functions works by temporarily binding `dired-marker-char' to
546;; Returns t if any work was done, nil otherwise. 546;; Returns t if any work was done, nil otherwise.
547(defun dired-mark-unmarked-files (regexp msg &optional unflag-p localp) 547(defun dired-mark-unmarked-files (regexp msg &optional unflag-p localp)
548 "Mark unmarked files matching REGEXP, displaying MSG. 548 "Mark unmarked files matching REGEXP, displaying MSG.
549REGEXP is matched against the entire file name. 549REGEXP is matched against the entire file name. When called
550Does not re-mark files which already have a mark. 550interactively, prompt for REGEXP.
551With prefix argument, unflag all those files. 551With prefix argument, unflag all those files.
552Optional fourth argument LOCALP is as in `dired-get-filename'." 552Optional fourth argument LOCALP is as in `dired-get-filename'."
553 (interactive "P") 553 (interactive
554 (list (dired-read-regexp
555 "Mark unmarked files matching regexp (default all): ")
556 nil current-prefix-arg nil))
554 (let ((dired-marker-char (if unflag-p ?\s dired-marker-char))) 557 (let ((dired-marker-char (if unflag-p ?\s dired-marker-char)))
555 (dired-mark-if 558 (dired-mark-if
556 (and 559 (and