1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00

(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.
This commit is contained in:
Eric S. Raymond 1993-10-04 20:51:01 +00:00
parent 8ff3d70355
commit 9a47d40b55

View File

@ -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))