diff options
| author | Sean Whitton | 2025-07-15 10:18:52 +0100 |
|---|---|---|
| committer | Sean Whitton | 2025-07-15 10:18:52 +0100 |
| commit | e4ea991ed9a147ee44c85d2d512b47032e5cc4b3 (patch) | |
| tree | a744367e5abb1cc403d0d9296e6f90067190e37e | |
| parent | 5d9a67e4bd374a0f6741bc56a37190aa51062d69 (diff) | |
| download | emacs-e4ea991ed9a147ee44c85d2d512b47032e5cc4b3.tar.gz emacs-e4ea991ed9a147ee44c85d2d512b47032e5cc4b3.zip | |
vc-resynch-window: Check whether auto-revert-mode is bound
* lisp/vc/vc-dispatcher.el (auto-revert-mode): Delete
declaration.
(vc-resynch-window): Check whether auto-revert-mode is bound.
| -rw-r--r-- | lisp/vc/vc-dispatcher.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el index d16e2fbb8d9..48ac8a11682 100644 --- a/lisp/vc/vc-dispatcher.el +++ b/lisp/vc/vc-dispatcher.el | |||
| @@ -679,7 +679,6 @@ ARG and NO-CONFIRM are passed on to `revert-buffer'." | |||
| 679 | 679 | ||
| 680 | (defvar view-old-buffer-read-only) | 680 | (defvar view-old-buffer-read-only) |
| 681 | 681 | ||
| 682 | (defvar auto-revert-mode) | ||
| 683 | (declare-function auto-revert-buffers "autorevert") | 682 | (declare-function auto-revert-buffers "autorevert") |
| 684 | 683 | ||
| 685 | (defun vc-resynch-window (file &optional keep noquery reset-vc-info) | 684 | (defun vc-resynch-window (file &optional keep noquery reset-vc-info) |
| @@ -703,7 +702,7 @@ editing!" | |||
| 703 | ;; `global-auto-revert-mode' or `vc-auto-revert-mode') | 702 | ;; `global-auto-revert-mode' or `vc-auto-revert-mode') |
| 704 | ;; then defer to that. Otherwise we do our own | 703 | ;; then defer to that. Otherwise we do our own |
| 705 | ;; VC-specific reverting. | 704 | ;; VC-specific reverting. |
| 706 | (if (and auto-revert-mode noquery) | 705 | (if (and (bound-and-true-p auto-revert-mode) noquery) |
| 707 | (auto-revert-buffers) | 706 | (auto-revert-buffers) |
| 708 | (vc-revert-buffer-internal t noquery)) | 707 | (vc-revert-buffer-internal t noquery)) |
| 709 | 708 | ||