Mercurial > emacs
changeset 54606:959316c3db53
(auto-revert-handler): Handle auto-revert-mode.
Call vc-find-file-hook here instead of in auto-revert-buffers.
(auto-revert-buffers): Delete call to vc-find-file-hook.
| author | Luc Teirlinck <teirllm@auburn.edu> |
|---|---|
| date | Sun, 28 Mar 2004 01:38:19 +0000 |
| parents | 7830fa922e7e |
| children | 3543991a6118 |
| files | lisp/autorevert.el |
| diffstat | 1 files changed, 5 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/autorevert.el Sat Mar 27 12:07:09 2004 +0000 +++ b/lisp/autorevert.el Sun Mar 28 01:38:19 2004 +0000 @@ -341,7 +341,7 @@ ((or (and (buffer-file-name) (file-readable-p (buffer-file-name)) (not (verify-visited-file-modtime (current-buffer)))) - (and global-auto-revert-non-file-buffers + (and (or auto-revert-mode global-auto-revert-non-file-buffers) revert-buffer-function (boundp 'buffer-stale-function) (functionp buffer-stale-function) @@ -351,6 +351,9 @@ (when auto-revert-verbose (message "Reverting buffer `%s'." (buffer-name))) (revert-buffer 'ignore-auto 'dont-ask 'preserve-modes) + ;; `preserve-modes' avoids changing the (minor) modes. But we + ;; do want to reset the mode for VC, so we do it explicitly. + (vc-find-file-hook) (if (eq revert 'vc) (vc-mode-line buffer-file-name)))))) @@ -404,11 +407,7 @@ (memq buf auto-revert-buffer-list)) (setq auto-revert-buffer-list (delq buf auto-revert-buffer-list))) - (when (auto-revert-active-p) - (auto-revert-handler) - ;; `preserve-modes' avoids changing the (minor) modes. But we - ;; do want to reset the mode for VC, so we do it explicitly. - (vc-find-file-hook))) + (when (auto-revert-active-p) (auto-revert-handler))) ;; Remove dead buffer from `auto-revert-buffer-list'. (setq auto-revert-buffer-list (delq buf auto-revert-buffer-list))))