(dired-mark-prompt): Don't count/display the t element.

Reported by Carsten Blaauw <it-media.blaauw@daimler.com>.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8155315..a8559f1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * dired.el (dired-mark-prompt): Don't count/display the t element.
+       Reported by Carsten Blaauw <it-media.blaauw@daimler.com>.
+
 2008-02-22  Bill Meier <wmeier@newsguy.com>  (tiny change)
 
        * progmodes/sh-script.el (sh-indent-comment): Docstring fix.

diff --git a/lisp/dired.el b/lisp/dired.el
index 55d8f4a..942a6e4 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2533,8 +2533,10 @@ deletion of non-empty directories is allowed."
   (if (= 1 count) "" "s"))
 
 (defun dired-mark-prompt (arg files)
-  ;; Return a string for use in a prompt, either the current file
-  ;; name, or the marker and a count of marked files.
+  "Return a string for use in a prompt, either the current file
+name, or the marker and a count of marked files."
+  ;; distinguish-one-marked can cause the first element to be just t.
+  (if (eq (car files) t) (setq files (cdr files)))
   (let ((count (length files)))
     (if (= count 1)
        (car files)