(vc-finish-logentry): Move killing the log buffer after

the operation in case that fails.

diff --git a/lisp/vc.el b/lisp/vc.el
index a5f0295e14fa317c6484420866404b9e6000c956..0f85e31b1e7efd35f9f21e4b0963862d047606c8 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -1182,17 +1182,18 @@ If nil, uses `change-log-default-name'."
        (log-version vc-log-version)
        (log-entry (buffer-string))
        (after-hook vc-log-after-operation-hook))
-    ;; Return to "parent" buffer of this checkin and remove checkin window
     (pop-to-buffer vc-parent-buffer)
-    (let ((logbuf (get-buffer "*VC-log*")))
-      (delete-windows-on logbuf)
-      (kill-buffer logbuf))
     ;; OK, do it to it
     (save-excursion
       (funcall log-operation 
               log-file
               log-version
               log-entry))
+    ;; Remove checkin window (after the checkin so that if that fails
+    ;; we don't zap the *VC-log* buffer and the typing therein).
+    (let ((logbuf (get-buffer "*VC-log*")))
+      (delete-windows-on logbuf)
+      (kill-buffer logbuf))
     ;; Now make sure we see the expanded headers
     (if buffer-file-name
        (vc-resynch-window buffer-file-name vc-keep-workfiles t))