diff options
| author | Eric S. Raymond <esr@snark.thyrsus.com> | 1993-10-04 20:51:01 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@snark.thyrsus.com> | 1993-10-04 20:51:01 +0000 |
| commit | 45805918b4968ef8adfc7f31f480733fb610fe0e (patch) | |
| tree | cb7c8a305c5057187353280cddc227cc4459b8da /lisp/vc.el | |
| parent | 5bb53e0a678120615f129427bb384747d3aa3267 (diff) | |
| download | emacs-45805918b4968ef8adfc7f31f480733fb610fe0e.tar.gz | |
(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.
Diffstat (limited to 'lisp/vc.el')
| -rw-r--r-- | lisp/vc.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index 060d64794eb..de99a97c828 100644 --- 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)) |