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

Follow-up fixes for vc-default-checkin-patch

Browse source 
* lisp/vc/vc.el (vc-default-checkin-patch):
Call vc-revert-file on buffer-file-name (vc-backend failed on
relative name sometimes).  Delete the tmp dir after copying all
files back, not just the first one.  Bug#52349,
https://lists.gnu.org/archive/html/emacs-devel/2022-10/msg01446.html.
This commit is contained in:
Dmitry Gutov 2022-10-18 02:33:43 +03:00
parent c2b79d9148
commit 5e77265523
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/vc/vc.el
View file

@ -1696,7 +1696,7 @@ Runs the normal hooks `vc-before-checkin-hook' and `vc-checkin-hook'."
(progn
(dolist (f files)
(with-current-buffer (find-file-noselect f)
(vc-revert-file f)))
(vc-revert-file buffer-file-name)))
(with-temp-buffer
;; Trying to support CVS too. Assuming that vc-diff
;; there will usually the diff root in default-directory.
@ -1724,8 +1724,8 @@ Runs the normal hooks `vc-before-checkin-hook' and `vc-checkin-hook'."
(expand-file-name f)
t)
(with-current-buffer (get-file-buffer f)
(revert-buffer t t t))
(delete-directory tmpdir t)))))
(revert-buffer t t t)))
(delete-directory tmpdir t))))
;;; Additional entry points for examining version histories