diff options
| author | Richard M. Stallman | 1992-11-03 09:25:26 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1992-11-03 09:25:26 +0000 |
| commit | 2de735de75f96dd7f00205f9b9f2e76cce4d8101 (patch) | |
| tree | 22e23946d8adc7af2e9eee9e87c2b0cb8ce00aa9 | |
| parent | 4e43240ad38b1a1d7362cb30bedb16404d2f3cb9 (diff) | |
| download | emacs-2de735de75f96dd7f00205f9b9f2e76cce4d8101.tar.gz emacs-2de735de75f96dd7f00205f9b9f2e76cce4d8101.zip | |
(dired-mark-confirm): For `compress', say `Compress or uncompress'.
(dired-map-over-marks-check): Likewise.
| -rw-r--r-- | lisp/dired-aux.el | 15 |
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)." | |||
| 505 | ;; pop-up unless OP-SYMBOL is a member of `dired-no-confirm'. | 505 | ;; pop-up unless OP-SYMBOL is a member of `dired-no-confirm'. |
| 506 | ;; The files used are determined by ARG (as in dired-get-marked-files). | 506 | ;; The files used are determined by ARG (as in dired-get-marked-files). |
| 507 | (or (memq op-symbol dired-no-confirm) | 507 | (or (memq op-symbol dired-no-confirm) |
| 508 | (let ((files (dired-get-marked-files t arg))) | 508 | (let ((files (dired-get-marked-files t arg)) |
| 509 | (string (if (eq op-symbol 'compress) "Compress or uncompress" | ||
| 510 | (capitalize (symbol-name op-symbol))))) | ||
| 509 | (dired-mark-pop-up nil op-symbol files (function y-or-n-p) | 511 | (dired-mark-pop-up nil op-symbol files (function y-or-n-p) |
| 510 | (concat (capitalize (symbol-name op-symbol)) " " | 512 | (concat string " " |
| 511 | (dired-mark-prompt arg files) "? "))))) | 513 | (dired-mark-prompt arg files) "? "))))) |
| 512 | 514 | ||
| 513 | (defun dired-map-over-marks-check (fun arg op-symbol &optional show-progress) | 515 | (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)." | |||
| 529 | (dired-map-over-marks (funcall fun) arg show-progress)) | 531 | (dired-map-over-marks (funcall fun) arg show-progress)) |
| 530 | (total (length total-list)) | 532 | (total (length total-list)) |
| 531 | (failures (delq nil total-list)) | 533 | (failures (delq nil total-list)) |
| 532 | (count (length failures))) | 534 | (count (length failures)) |
| 535 | (string (if (eq op-symbol 'compress) "Compress or uncompress" | ||
| 536 | (capitalize (symbol-name op-symbol))))) | ||
| 533 | (if (not failures) | 537 | (if (not failures) |
| 534 | (message "%s: %d file%s." | 538 | (message "%s: %d file%s." |
| 535 | (capitalize (symbol-name op-symbol)) | 539 | string total (dired-plural-s total)) |
| 536 | total (dired-plural-s total)) | ||
| 537 | ;; end this bunch of errors: | 540 | ;; end this bunch of errors: |
| 538 | (dired-log-summary | 541 | (dired-log-summary |
| 539 | (format "Failed to %s %d of %d file%s" | 542 | (format "Failed to %s %d of %d file%s" |
| 540 | (symbol-name op-symbol) count total (dired-plural-s total)) | 543 | (downcase string) count total (dired-plural-s total)) |
| 541 | failures))))) | 544 | failures))))) |
| 542 | 545 | ||
| 543 | (defvar dired-query-alist | 546 | (defvar dired-query-alist |