(vc-next-action) Fix (throw ... ) invocation to work with 19; this

allows vc-next-action on all marked files in a dired buffer to work.

(vc-finish-logentry) There isn't necessarily a *VC-log-entry* buffer
to remove if this function was called from within a dired buffer.  Fix
its handling of this case.

diff --git a/lisp/vc.el b/lisp/vc.el
index 060d64794eb1634d274fd3549f4d253aef0d9aa4..de99a97c828e4efddf1f7e16bcd1c5d34f566237 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -451,7 +451,7 @@ lock steals will raise an error."
            (vc-start-entry nil nil nil
                            "Enter a change comment for the marked files."
                            'vc-next-action-dired)
-           (throw 'nogo))))
+           (throw 'nogo nil))))
     (while vc-parent-buffer
       (pop-to-buffer vc-parent-buffer))
     (if buffer-file-name
@@ -653,8 +653,9 @@ If nil, uses `change-log-default-name'."
     (error "No log operation is pending"))
   ;; Return to "parent" buffer of this checkin and remove checkin window
   (pop-to-buffer vc-parent-buffer)
-  (delete-windows-on (get-buffer "*VC-log*"))
-  (kill-buffer "*VC-log*")
+  (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))