[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r116354: * dired.el (dired-internal-do-deletions) me
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] trunk r116354: * dired.el (dired-internal-do-deletions) messaging fixup |
Date: |
Sun, 09 Feb 2014 02:20:30 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116354
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16331
committer: Lars Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Sat 2014-02-08 18:19:15 -0800
message:
* 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.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/dired.el dired.el-20091113204419-o5vbwnq5f7feedwu-482
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-02-09 02:13:23 +0000
+++ b/lisp/ChangeLog 2014-02-09 02:19:15 +0000
@@ -1,5 +1,8 @@
2014-02-09 Lars Ingebrigtsen <address@hidden>
+ * 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.
=== modified file 'lisp/dired.el'
--- a/lisp/dired.el 2014-02-08 06:20:17 +0000
+++ b/lisp/dired.el 2014-02-09 02:19:15 +0000
@@ -2905,11 +2905,7 @@
(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 @@
(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 @@
(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)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r116354: * dired.el (dired-internal-do-deletions) messaging fixup,
Lars Ingebrigtsen <=