changeset 1538:2d29bf379da3

(dired-mark-confirm): For `compress', say `Compress or uncompress'. (dired-map-over-marks-check): Likewise.
author Richard M. Stallman <rms@gnu.org>
date Tue, 03 Nov 1992 09:25:26 +0000
parents 8531c6d96e5c
children 5677f906bf78
files lisp/dired-aux.el
diffstat 1 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/dired-aux.el	Tue Nov 03 07:07:02 1992 +0000
+++ b/lisp/dired-aux.el	Tue Nov 03 09:25:26 1992 +0000
@@ -505,9 +505,11 @@
   ;; pop-up unless OP-SYMBOL is a member of `dired-no-confirm'.
   ;; The files used are determined by ARG (as in dired-get-marked-files).
   (or (memq op-symbol dired-no-confirm)
-      (let ((files (dired-get-marked-files t arg)))
+      (let ((files (dired-get-marked-files t arg))
+	    (string (if (eq op-symbol 'compress) "Compress or uncompress"
+		      (capitalize (symbol-name op-symbol)))))
 	(dired-mark-pop-up nil op-symbol files (function y-or-n-p)
-			   (concat (capitalize (symbol-name op-symbol)) " "
+			   (concat string " "
 				   (dired-mark-prompt arg files) "? ")))))
 
 (defun dired-map-over-marks-check (fun arg op-symbol &optional show-progress)
@@ -529,15 +531,16 @@
 	      (dired-map-over-marks (funcall fun) arg show-progress))
 	     (total (length total-list))
 	     (failures (delq nil total-list))
-	     (count (length failures)))
+	     (count (length failures))
+	     (string (if (eq op-symbol 'compress) "Compress or uncompress"
+		       (capitalize (symbol-name op-symbol)))))
 	(if (not failures)
 	    (message "%s: %d file%s."
-		     (capitalize (symbol-name op-symbol))
-		     total (dired-plural-s total))
+		     string total (dired-plural-s total))
 	  ;; end this bunch of errors:
 	  (dired-log-summary
 	   (format "Failed to %s %d of %d file%s"
-		   (symbol-name op-symbol) count total (dired-plural-s total))
+		   (downcase string) count total (dired-plural-s total))
 	   failures)))))
 
 (defvar dired-query-alist