From: Karl Heuer <kwzh@gnu.org>
Date: Sun, 18 Jan 1998 03:27:05 +0000 (+0000)
Subject: (vc-finish-logentry): Move killing the log buffer after
X-Git-Tag: emacs-20.3~2413
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=df1e7b91207aa141d7c1ddc0dad8ac342cd46065;p=emacs.git

(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 a5f0295e14f..0f85e31b1e7 100644
--- 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))