emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 5e77265523: Follow-up fixes for vc-default-checkin-patch


From: Dmitry Gutov
Subject: master 5e77265523: Follow-up fixes for vc-default-checkin-patch
Date: Mon, 17 Oct 2022 19:35:32 -0400 (EDT)

branch: master
commit 5e7726552340a3a27b3445b2094bdcc004277d2a
Author: Dmitry Gutov <dgutov@yandex.ru>
Commit: Dmitry Gutov <dgutov@yandex.ru>

    Follow-up fixes for vc-default-checkin-patch
    
    * 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.
---
 lisp/vc/vc.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 7152b51eff..2a09d70209 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -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
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]