# HG changeset patch # User Eric S. Raymond # Date 749767861 0 # Node ID 4c49473fbfd4bc15d395ddc03a8b468fe8b3b6f3 # Parent 2a5085c3293548968680fe419255f0b0aa10f9cb (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 -r 2a5085c32935 -r 4c49473fbfd4 lisp/vc.el --- a/lisp/vc.el Mon Oct 04 04:31:33 1993 +0000 +++ b/lisp/vc.el Mon Oct 04 20:51:01 1993 +0000 @@ -451,7 +451,7 @@ (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 @@ (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))