diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2011-10-10 19:52:03 +0200 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2011-10-10 19:52:03 +0200 |
| commit | 366ca7f3da85b695afa34c3c3270b16a16d47f42 (patch) | |
| tree | ea5b9cb51b10e48b8165da7b3609f525b5385989 /lisp/vc/vc-dispatcher.el | |
| parent | 0563dae9a9e3a8c2b6de454693c0cc207e67f05d (diff) | |
| download | emacs-366ca7f3da85b695afa34c3c3270b16a16d47f42.tar.gz | |
In vc actions use quit-windows-on instead of delete-windows-on.
* window.el (quit-windows-on): New function.
* vc/vc.el (vc-revert, vc-rollback):
* vc/vc-dispatcher.el (vc-finish-logentry): Call quit-windows-on
instead of deleting windows. (Bug#4557) (Bug#5310) (Bug#5556)
(Bug#6183) (Bug#7074)((Bug#7447)
Diffstat (limited to 'lisp/vc/vc-dispatcher.el')
| -rw-r--r-- | lisp/vc/vc-dispatcher.el | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el index 388d4c94a08..84c7f4a510b 100644 --- a/lisp/vc/vc-dispatcher.el +++ b/lisp/vc/vc-dispatcher.el @@ -666,18 +666,15 @@ the buffer contents as a comment." (funcall log-operation log-fileset log-entry)) - ;; Remove checkin window (after the checkin so that if that fails - ;; we don't zap the log buffer and the typing therein). - ;; -- IMO this should be replaced with quit-window - (cond ((and logbuf vc-delete-logbuf-window) - (delete-windows-on logbuf (selected-frame)) - ;; Kill buffer and delete any other dedicated windows/frames. - (kill-buffer logbuf)) - (logbuf - (with-selected-window (or (get-buffer-window logbuf 0) - (selected-window)) - (with-current-buffer logbuf - (bury-buffer))))) + + ;; Quit windows on logbuf. + (cond + ((not logbuf)) + (vc-delete-logbuf-window + (quit-windows-on logbuf t (selected-frame))) + (t + (quit-windows-on logbuf nil 0))) + ;; Now make sure we see the expanded headers (when log-fileset (mapc |