bug#5556: [PATCH] vc-next-action destroys window configuration

[Nathaniel Flath <flat0103@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 543 bytes --]

Sorry - somehow I ended up attaching an old version of the patch.  The
correct one is attached.

Proposed changelog entry:

Prevent vc actions from destroying window configuration

* vc-dispatcher.el (vc-finish-logentry): Changed delete-windows-on to
quit-window

On Wed, Feb 10, 2010 at 2:30 AM, Glenn Morris <rgm@gnu.org> wrote:

>
> Your patch seems to include a huge number of formatting changes
> throughout the file. Please could you send it again, with just the
> actual relevant changes, and with a proposed ChangeLog entry. Thanks.
>

[-- Attachment #1.2: Type: text/html, Size: 843 bytes --]

[-- Attachment #2: vc.patch --]
[-- Type: text/x-patch, Size: 658 bytes --]

diff --git a/lisp/vc-dispatcher.el b/lisp/vc-dispatcher.el
index bf3da4e..8aa412f 100644
--- a/lisp/vc-dispatcher.el
+++ b/lisp/vc-dispatcher.el
@@ -604,9 +604,8 @@ the buffer contents as a comment."
 	       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))
+	   (quit-window t) 
 	   ;; Kill buffer and delete any other dedicated windows/frames.
 	   (kill-buffer logbuf))
 	  (logbuf (pop-to-buffer logbuf)