aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2008-08-20 22:41:45 +0000
committerChong Yidong2008-08-20 22:41:45 +0000
commit423732e4fb5e4d08f60319290002e7817240fcb9 (patch)
tree46941b93c3077a9ae1bd20279e5c86d882a4b142
parentc5edc28f43f2999cf73600e8e5a06021f9fb2ede (diff)
downloademacs-423732e4fb5e4d08f60319290002e7817240fcb9.tar.gz
emacs-423732e4fb5e4d08f60319290002e7817240fcb9.zip
(wdired-old-auto-revert-mode): New var.
(wdired-change-to-wdired-mode): Turn off auto-revert-mode. (wdired-change-to-dired-mode): Turn auto-revert-mode on if it used to be on.
-rw-r--r--lisp/wdired.el10
1 files changed, 10 insertions, 0 deletions
diff --git a/lisp/wdired.el b/lisp/wdired.el
index e2d6a4b85b8..f2f863ef971 100644
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -207,6 +207,7 @@ program `dired-chmod-program', which must exist."
207(defvar wdired-col-perm) ;; Column where the permission bits start 207(defvar wdired-col-perm) ;; Column where the permission bits start
208(defvar wdired-old-content) 208(defvar wdired-old-content)
209(defvar wdired-old-point) 209(defvar wdired-old-point)
210(defvar wdired-old-auto-revert-mode nil)
210 211
211 212
212(defun wdired-mode () 213(defun wdired-mode ()
@@ -242,6 +243,10 @@ See `wdired-mode'."
242 (buffer-substring (point-min) (point-max))) 243 (buffer-substring (point-min) (point-max)))
243 (set (make-local-variable 'wdired-old-point) (point)) 244 (set (make-local-variable 'wdired-old-point) (point))
244 (set (make-local-variable 'query-replace-skip-read-only) t) 245 (set (make-local-variable 'query-replace-skip-read-only) t)
246 (when (and (boundp 'auto-revert-mode)
247 auto-revert-mode)
248 (set (make-local-variable 'wdired-old-auto-revert-mode) t)
249 (auto-revert-mode 0))
245 (use-local-map wdired-mode-map) 250 (use-local-map wdired-mode-map)
246 (force-mode-line-update) 251 (force-mode-line-update)
247 (setq buffer-read-only nil) 252 (setq buffer-read-only nil)
@@ -349,6 +354,11 @@ non-nil means return old filename."
349 (setq mode-name "Dired") 354 (setq mode-name "Dired")
350 (dired-advertise) 355 (dired-advertise)
351 (remove-hook 'kill-buffer-hook 'wdired-check-kill-buffer t) 356 (remove-hook 'kill-buffer-hook 'wdired-check-kill-buffer t)
357 (when wdired-old-auto-revert-mode
358 (kill-local-variable 'wdired-old-auto-revert-mode)
359 (and (boundp 'auto-revert-mode)
360 (null auto-revert-mode)
361 (auto-revert-mode 1)))
352 (set (make-local-variable 'revert-buffer-function) 'dired-revert)) 362 (set (make-local-variable 'revert-buffer-function) 'dired-revert))
353 363
354 364