mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-05 11:45:45 +00:00
* 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
This commit is contained in:
parent
d6d5fdf826
commit
20dda93066
@ -1,5 +1,8 @@
|
||||
2014-02-09 Lars Ingebrigtsen <larsi@gnus.org>
|
||||
|
||||
* dired.el (dired-internal-do-deletions): Don't say "Deleting..."
|
||||
before we actually start to delete things (bug#16331).
|
||||
|
||||
* subr.el (event-start): Doc fix (bug#14228).
|
||||
(event-end): Ditto.
|
||||
|
||||
|
@ -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)))
|
||||
|
Loading…
Reference in New Issue
Block a user