Mercurial > emacs
comparison lisp/autorevert.el @ 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 | 6a2022999abf |
| children | b35a0c2934f9 |
comparison
equal
deleted
inserted
replaced
| 54605:7830fa922e7e | 54606:959316c3db53 |
|---|---|
| 339 (when (auto-revert-handler-vc) | 339 (when (auto-revert-handler-vc) |
| 340 (setq revert 'vc))) | 340 (setq revert 'vc))) |
| 341 ((or (and (buffer-file-name) | 341 ((or (and (buffer-file-name) |
| 342 (file-readable-p (buffer-file-name)) | 342 (file-readable-p (buffer-file-name)) |
| 343 (not (verify-visited-file-modtime (current-buffer)))) | 343 (not (verify-visited-file-modtime (current-buffer)))) |
| 344 (and global-auto-revert-non-file-buffers | 344 (and (or auto-revert-mode global-auto-revert-non-file-buffers) |
| 345 revert-buffer-function | 345 revert-buffer-function |
| 346 (boundp 'buffer-stale-function) | 346 (boundp 'buffer-stale-function) |
| 347 (functionp buffer-stale-function) | 347 (functionp buffer-stale-function) |
| 348 (funcall buffer-stale-function t))) | 348 (funcall buffer-stale-function t))) |
| 349 (setq revert t))) | 349 (setq revert t))) |
| 350 (when revert | 350 (when revert |
| 351 (when auto-revert-verbose | 351 (when auto-revert-verbose |
| 352 (message "Reverting buffer `%s'." (buffer-name))) | 352 (message "Reverting buffer `%s'." (buffer-name))) |
| 353 (revert-buffer 'ignore-auto 'dont-ask 'preserve-modes) | 353 (revert-buffer 'ignore-auto 'dont-ask 'preserve-modes) |
| 354 ;; `preserve-modes' avoids changing the (minor) modes. But we | |
| 355 ;; do want to reset the mode for VC, so we do it explicitly. | |
| 356 (vc-find-file-hook) | |
| 354 (if (eq revert 'vc) | 357 (if (eq revert 'vc) |
| 355 (vc-mode-line buffer-file-name)))))) | 358 (vc-mode-line buffer-file-name)))))) |
| 356 | 359 |
| 357 (defun auto-revert-buffers () | 360 (defun auto-revert-buffers () |
| 358 "Revert buffers as specified by Auto-Revert and Global Auto-Revert Mode. | 361 "Revert buffers as specified by Auto-Revert and Global Auto-Revert Mode. |
| 402 ;; non-standard way, for example by changing major mode. | 405 ;; non-standard way, for example by changing major mode. |
| 403 (if (and (not auto-revert-mode) | 406 (if (and (not auto-revert-mode) |
| 404 (memq buf auto-revert-buffer-list)) | 407 (memq buf auto-revert-buffer-list)) |
| 405 (setq auto-revert-buffer-list | 408 (setq auto-revert-buffer-list |
| 406 (delq buf auto-revert-buffer-list))) | 409 (delq buf auto-revert-buffer-list))) |
| 407 (when (auto-revert-active-p) | 410 (when (auto-revert-active-p) (auto-revert-handler))) |
| 408 (auto-revert-handler) | |
| 409 ;; `preserve-modes' avoids changing the (minor) modes. But we | |
| 410 ;; do want to reset the mode for VC, so we do it explicitly. | |
| 411 (vc-find-file-hook))) | |
| 412 ;; Remove dead buffer from `auto-revert-buffer-list'. | 411 ;; Remove dead buffer from `auto-revert-buffer-list'. |
| 413 (setq auto-revert-buffer-list | 412 (setq auto-revert-buffer-list |
| 414 (delq buf auto-revert-buffer-list)))) | 413 (delq buf auto-revert-buffer-list)))) |
| 415 (setq bufs (cdr bufs))) | 414 (setq bufs (cdr bufs))) |
| 416 (setq auto-revert-remaining-buffers bufs) | 415 (setq auto-revert-remaining-buffers bufs) |