(dired-mark-if): Make the message about whether it's marking or unmarking clearer...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0d7ebbadaeffbeb602d2b485833f974bcd3dd5ee..11e828634f5bab6e9935304100ecf0b05321c913 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-02  Drew Adams  <drew.adams@oracle.com>
+
+       * dired.el (dired-mark-if): Make the message about whether it's
+       marking or unmarking clearer (bug#8523).
+
 2011-07-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * disp-table.el (display-table-print-array): New function.

diff --git a/lisp/dired.el b/lisp/dired.el
index c446b5d3dfaf6e117bc7852e24070178cf929731..92f3a46306bf23b6870d5dad0bf5a1181979a973 100644 (file)
--- 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."
   `(let ((inhibit-read-only t) count)
     (save-excursion
       (setq count 0)
-      (if ,msg (message "Marking %ss..." ,msg))
+      (when ,msg
+       (message "%s %ss%s..."
+                (cond ((eq dired-marker-char ?\040) "Unmarking")
+                      ((eq dired-del-marker dired-marker-char)
+                       "Flagging")
+                      (t "Marking"))
+                ,msg
+                (if (eq dired-del-marker dired-marker-char)
+                    " for deletion"
+                  "")))
       (goto-char (point-min))
       (while (not (eobp))
         (if ,predicate