[Emacs-diffs] /srv/bzr/emacs/trunk r104868: (dired-mark-if): Make the message about whether it's marking or unmarking clearer (bug#8523)

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 104868
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Sat 2011-07-02 15:28:19 +0200
message:
  (dired-mark-if): Make the message about whether it's marking or unmarking 
clearer (bug#8523)
modified:
  lisp/ChangeLog
  lisp/dired.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-02 12:27:53 +0000
+++ b/lisp/ChangeLog    2011-07-02 13:28:19 +0000
@@ -1,3 +1,8 @@
+2011-07-02  Drew Adams  <address@hidden>
+
+       * dired.el (dired-mark-if): Make the message about whether it's
+       marking or unmarking clearer (bug#8523).
+
 2011-07-02  Lars Magne Ingebrigtsen  <address@hidden>
 
        * disp-table.el (display-table-print-array): New function.

=== modified file 'lisp/dired.el'
--- a/lisp/dired.el     2011-07-02 10:23:45 +0000
+++ b/lisp/dired.el     2011-07-02 13:28:19 +0000
@@ -485,7 +485,16 @@
   `(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