diff options
author | Lars Ingebrigtsen <larsi@gnus.org> | 2014-02-08 18:19:15 -0800 |
---|---|---|
committer | Lars Ingebrigtsen <larsi@gnus.org> | 2014-02-08 18:19:15 -0800 |
commit | 20dda9306673d4c96665fcca5dc286dbd987c8d6 (patch) | |
tree | 9d66a4d4e6dae5350541b464159e8326f81c576c /lisp/dired.el | |
parent | d6d5fdf826ce74ac3a99cb72aae54cbc2974ffe2 (diff) | |
download | emacs-20dda9306673d4c96665fcca5dc286dbd987c8d6.tar.gz |
* dired.el (dired-internal-do-deletions) messaging fixup
* dired.el (dired-internal-do-deletions): Don't say "Deleting..."
before we actually start to delete things.
Fixes: debbugs:16331
Diffstat (limited to 'lisp/dired.el')
-rw-r--r-- | lisp/dired.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/dired.el b/lisp/dired.el index 5e0c9047005..36a432c05ce 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -2905,11 +2905,7 @@ non-empty directories is allowed." (let* ((files (mapcar (function car) l)) (count (length l)) (succ 0) - (trashing (and trash delete-by-moving-to-trash)) - (progress-reporter - (make-progress-reporter - (if trashing "Trashing..." "Deleting...") - succ count))) + (trashing (and trash delete-by-moving-to-trash))) ;; canonicalize file list for pop up (setq files (nreverse (mapcar (function dired-make-relative) files))) (if (dired-mark-pop-up @@ -2918,7 +2914,11 @@ non-empty directories is allowed." (if trashing "Trash" "Delete") (dired-mark-prompt arg files))) (save-excursion - (let (failures);; files better be in reverse order for this loop! + (let ((progress-reporter + (make-progress-reporter + (if trashing "Trashing..." "Deleting...") + succ count)) + failures) ;; files better be in reverse order for this loop! (while l (goto-char (cdr (car l))) (let ((inhibit-read-only t)) @@ -2931,7 +2931,7 @@ non-empty directories is allowed." (dired-fun-in-all-buffers (file-name-directory fn) (file-name-nondirectory fn) (function dired-delete-entry) fn)) - (error;; catch errors from failed deletions + (error ;; catch errors from failed deletions (dired-log "%s\n" err) (setq failures (cons (car (car l)) failures))))) (setq l (cdr l))) |