changeset 80177:8de8dd7c8cb4

(dired-mark-prompt): Don't count/display the t element. Reported by Carsten Blaauw <it-media.blaauw@daimler.com>.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 22 Feb 2008 18:47:26 +0000
parents 0a655e2d1d8c
children f08bf94dad9e
files lisp/ChangeLog lisp/dired.el
diffstat 2 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Feb 22 01:28:08 2008 +0000
+++ b/lisp/ChangeLog	Fri Feb 22 18:47:26 2008 +0000
@@ -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.
--- a/lisp/dired.el	Fri Feb 22 01:28:08 2008 +0000
+++ b/lisp/dired.el	Fri Feb 22 18:47:26 2008 +0000
@@ -2533,8 +2533,10 @@
   (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)