procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vc-revert: Offer to save modified buffers (bug#55310)

Browse source 
* lisp/vc/vc.el (vc-revert): Offer to save modified buffers that
otherwise prevent proceeding with the revert (bug#55310).
This commit is contained in:
Sean Whitton 2025-03-15 16:02:56 +08:00
parent f5f3fb7dd4
commit 6f483ffdc2
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lisp/vc/vc.el
View file

@ -3243,14 +3243,21 @@ to the working revision (except for keyword expansion)."
;; show the changes and ask for confirmation to discard them.
(when (or (not files) (memq (buffer-file-name) files))
(vc-buffer-sync nil))
(dolist (file files)
(let ((buf (get-file-buffer file)))
(when (and buf (buffer-modified-p buf))
(error "Please kill or save all modified buffers before reverting")))
(when (vc-up-to-date-p file)
(if (yes-or-no-p (format "%s seems up-to-date. Revert anyway? " file))
(setq queried t)
(error "Revert canceled"))))
(save-some-buffers nil (lambda ()
(member (buffer-file-name) files)))
(let (needs-save)
(dolist (file files)
(let ((buf (get-file-buffer file)))
(when (and buf (buffer-modified-p buf))
(push buf needs-save)))
(when (vc-up-to-date-p file)
(if (yes-or-no-p (format "%s seems up-to-date. Revert anyway? "
file))
(setq queried t)
(error "Revert canceled"))))
(when needs-save
(error "Cannot revert with these buffers unsaved: %s"
(string-join (mapcar #'buffer-name needs-save) ", "))))
(unwind-protect
(when (if vc-revert-show-diff
(progn