mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

vc-resynch-window: Restore always using vc-revert-buffer-internal

Browse source 
* lisp/vc/vc-dispatcher.el (auto-revert-buffers): Delete.
(vc-resynch-window): Always call vc-revert-buffer-internal.
Calling auto-revert-buffers will not necessarily revert the
current buffer, but we want it to happen synchronously.
This commit is contained in:
Sean Whitton 2025-11-22 13:50:22 +00:00
parent 24c09c68dd
commit cd86307f26
1 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lisp/vc/vc-dispatcher.el
View file

@ -749,8 +749,6 @@ ARG and NO-CONFIRM are passed on to `revert-buffer'."
(defvar view-old-buffer-read-only)
(declare-function auto-revert-buffers "autorevert")
(defun vc-resynch-window (file &optional keep noquery reset-vc-info)
"If FILE is in the current buffer, either revert or unvisit it.
The choice between revert (to see expanded keywords) and unvisit
@ -768,13 +766,7 @@ editing!"
((file-exists-p file)
(when reset-vc-info
(vc-file-clearprops file))
;; If `auto-revert-mode' is on (probably due to either
;; `global-auto-revert-mode' or `vc-auto-revert-mode')
;; then defer to that. Otherwise we do our own
;; VC-specific reverting.
(if (and (bound-and-true-p auto-revert-mode) noquery)
(auto-revert-buffers)
(vc-revert-buffer-internal t noquery))
(vc-revert-buffer-internal t noquery)
;; VC operations might toggle the read-only state. In
;; that case we need to adjust the `view-mode' status