comparison lisp/dired.el @ 92148:f991f10f15ec

Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1074
author Miles Bader <miles@gnu.org>
date Sun, 24 Feb 2008 10:09:07 +0000
parents 107ccd98fa12 8de8dd7c8cb4
children d6c8f902278a
comparison
equal deleted inserted replaced
92147:773ae07da318 92148:f991f10f15ec
2548 2548
2549 (defun dired-plural-s (count) 2549 (defun dired-plural-s (count)
2550 (if (= 1 count) "" "s")) 2550 (if (= 1 count) "" "s"))
2551 2551
2552 (defun dired-mark-prompt (arg files) 2552 (defun dired-mark-prompt (arg files)
2553 ;; Return a string for use in a prompt, either the current file 2553 "Return a string for use in a prompt, either the current file
2554 ;; name, or the marker and a count of marked files. 2554 name, or the marker and a count of marked files."
2555 ;; distinguish-one-marked can cause the first element to be just t.
2556 (if (eq (car files) t) (setq files (cdr files)))
2555 (let ((count (length files))) 2557 (let ((count (length files)))
2556 (if (= count 1) 2558 (if (= count 1)
2557 (car files) 2559 (car files)
2558 ;; more than 1 file: 2560 ;; more than 1 file:
2559 (if (integerp arg) 2561 (if (integerp arg)