summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1992-11-03 09:25:26 +0000
committerRichard M. Stallman <rms@gnu.org>1992-11-03 09:25:26 +0000
commit2de735de75f96dd7f00205f9b9f2e76cce4d8101 (patch)
tree22e23946d8adc7af2e9eee9e87c2b0cb8ce00aa9
parent4e43240ad38b1a1d7362cb30bedb16404d2f3cb9 (diff)
downloademacs-2de735de75f96dd7f00205f9b9f2e76cce4d8101.tar.gz
(dired-mark-confirm): For `compress', say `Compress or uncompress'.
(dired-map-over-marks-check): Likewise.
-rw-r--r--lisp/dired-aux.el15
1 files changed, 9 insertions, 6 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index fa8951b69b1..c34fd50f0e7 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -505,9 +505,11 @@ and use this command with a prefix argument (the value does not matter)."
;; 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 @@ and use this command with a prefix argument (the value does not matter)."
(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