aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/dired.el11
2 files changed, 15 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0d7ebbadaef..11e828634f5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-07-02 Drew Adams <drew.adams@oracle.com>
2
3 * dired.el (dired-mark-if): Make the message about whether it's
4 marking or unmarking clearer (bug#8523).
5
12011-07-02 Lars Magne Ingebrigtsen <larsi@gnus.org> 62011-07-02 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 7
3 * disp-table.el (display-table-print-array): New function. 8 * disp-table.el (display-table-print-array): New function.
diff --git a/lisp/dired.el b/lisp/dired.el
index c446b5d3dfa..92f3a46306b 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -485,7 +485,16 @@ Return value is the number of files marked, or nil if none were marked."
485 `(let ((inhibit-read-only t) count) 485 `(let ((inhibit-read-only t) count)
486 (save-excursion 486 (save-excursion
487 (setq count 0) 487 (setq count 0)
488 (if ,msg (message "Marking %ss..." ,msg)) 488 (when ,msg
489 (message "%s %ss%s..."
490 (cond ((eq dired-marker-char ?\040) "Unmarking")
491 ((eq dired-del-marker dired-marker-char)
492 "Flagging")
493 (t "Marking"))
494 ,msg
495 (if (eq dired-del-marker dired-marker-char)
496 " for deletion"
497 "")))
489 (goto-char (point-min)) 498 (goto-char (point-min))
490 (while (not (eobp)) 499 (while (not (eobp))
491 (if ,predicate 500 (if ,predicate