aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/dired.el14
2 files changed, 10 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ead1915cef1..3f730aba5e2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12014-02-09 Lars Ingebrigtsen <larsi@gnus.org> 12014-02-09 Lars Ingebrigtsen <larsi@gnus.org>
2 2
3 * dired.el (dired-internal-do-deletions): Don't say "Deleting..."
4 before we actually start to delete things (bug#16331).
5
3 * subr.el (event-start): Doc fix (bug#14228). 6 * subr.el (event-start): Doc fix (bug#14228).
4 (event-end): Ditto. 7 (event-end): Ditto.
5 8
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."
2905 (let* ((files (mapcar (function car) l)) 2905 (let* ((files (mapcar (function car) l))
2906 (count (length l)) 2906 (count (length l))
2907 (succ 0) 2907 (succ 0)
2908 (trashing (and trash delete-by-moving-to-trash)) 2908 (trashing (and trash delete-by-moving-to-trash)))
2909 (progress-reporter
2910 (make-progress-reporter
2911 (if trashing "Trashing..." "Deleting...")
2912 succ count)))
2913 ;; canonicalize file list for pop up 2909 ;; canonicalize file list for pop up
2914 (setq files (nreverse (mapcar (function dired-make-relative) files))) 2910 (setq files (nreverse (mapcar (function dired-make-relative) files)))
2915 (if (dired-mark-pop-up 2911 (if (dired-mark-pop-up
@@ -2918,7 +2914,11 @@ non-empty directories is allowed."
2918 (if trashing "Trash" "Delete") 2914 (if trashing "Trash" "Delete")
2919 (dired-mark-prompt arg files))) 2915 (dired-mark-prompt arg files)))
2920 (save-excursion 2916 (save-excursion
2921 (let (failures);; files better be in reverse order for this loop! 2917 (let ((progress-reporter
2918 (make-progress-reporter
2919 (if trashing "Trashing..." "Deleting...")
2920 succ count))
2921 failures) ;; files better be in reverse order for this loop!
2922 (while l 2922 (while l
2923 (goto-char (cdr (car l))) 2923 (goto-char (cdr (car l)))
2924 (let ((inhibit-read-only t)) 2924 (let ((inhibit-read-only t))
@@ -2931,7 +2931,7 @@ non-empty directories is allowed."
2931 (dired-fun-in-all-buffers 2931 (dired-fun-in-all-buffers
2932 (file-name-directory fn) (file-name-nondirectory fn) 2932 (file-name-directory fn) (file-name-nondirectory fn)
2933 (function dired-delete-entry) fn)) 2933 (function dired-delete-entry) fn))
2934 (error;; catch errors from failed deletions 2934 (error ;; catch errors from failed deletions
2935 (dired-log "%s\n" err) 2935 (dired-log "%s\n" err)
2936 (setq failures (cons (car (car l)) failures))))) 2936 (setq failures (cons (car (car l)) failures)))))
2937 (setq l (cdr l))) 2937 (setq l (cdr l)))