(vc-finish-logentry): Use the value of vc-log-after-operation-hook of

*VC-log* buffer instead of vc-parent-buffer.

diff --git a/lisp/vc.el b/lisp/vc.el
index 9ce870752bed2f680e9b511a8a9c00641630062f..07f37334c65a937e3073df0a19862d0fb3d56822 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -686,15 +686,17 @@ If nil, uses `change-log-default-name'."
                 vc-log-version
                 (buffer-string)))
     (error "No log operation is pending"))
-  ;; 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))
-  ;; Now make sure we see the expanded headers
-  (if buffer-file-name
+  ;; save the vc-log-after-operation-hook of log buffer
+  (let ((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))
+    ;; Now make sure we see the expanded headers
+    (if buffer-file-name
        (vc-resynch-window buffer-file-name vc-keep-workfiles t))
-  (run-hooks vc-log-after-operation-hook))
+    (run-hooks after-hook)))
 
 ;; Code for access to the comment ring