aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Liu2010-12-06 14:55:21 -0500
committerChong Yidong2010-12-06 14:55:21 -0500
commit86a6e8e02cf3462dd8a0b2660dce5b7c5a78b734 (patch)
treeb2b530ea670cac220cfdcdbee9808ef0883c6d7a
parentbc60f4de593965f51944d8916bba9311433d23db (diff)
downloademacs-86a6e8e02cf3462dd8a0b2660dce5b7c5a78b734.tar.gz
emacs-86a6e8e02cf3462dd8a0b2660dce5b7c5a78b734.zip
* dired-aux.el (dired-do-redisplay): Postphone dired-after-readin-hook while mapping over marks (Bug#6810).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/dired-aux.el6
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a758e7f0a7f..8609df4c053 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-12-06 Leo <sdl.web@gmail.com>
2
3 * dired-aux.el (dired-do-redisplay): Postphone
4 dired-after-readin-hook while mapping over marks (Bug#6810).
5
12010-12-06 Chong Yidong <cyd@stupidchicken.com> 62010-12-06 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * image-dired.el (image-dired-db-file) 8 * image-dired.el (image-dired-db-file)
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 62d6928c024..b711934da21 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1017,10 +1017,14 @@ See Info node `(emacs)Subdir switches' for more details."
1017 ;; message much faster than making dired-map-over-marks show progress 1017 ;; message much faster than making dired-map-over-marks show progress
1018 (dired-uncache 1018 (dired-uncache
1019 (if (consp dired-directory) (car dired-directory) dired-directory)) 1019 (if (consp dired-directory) (car dired-directory) dired-directory))
1020 (dired-map-over-marks (let ((fname (dired-get-filename))) 1020 (dired-map-over-marks (let ((fname (dired-get-filename))
1021 ;; Postphone readin hook till we map
1022 ;; over all marked files (Bug#6810).
1023 (dired-after-readin-hook nil))
1021 (message "Redisplaying... %s" fname) 1024 (message "Redisplaying... %s" fname)
1022 (dired-update-file-line fname)) 1025 (dired-update-file-line fname))
1023 arg) 1026 arg)
1027 (run-hooks 'dired-after-readin-hook)
1024 (dired-move-to-filename) 1028 (dired-move-to-filename)
1025 (message "Redisplaying...done"))) 1029 (message "Redisplaying...done")))
1026 1030