From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 20 Apr 2010 16:52:43 +0000 (-0400)
Subject: * vc-dispatcher (vc-finish-logentry): Don't mess with the windows/frames.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~469
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cb4f951325583593304626961b9ef30e8eb9ca57;p=emacs.git

* vc-dispatcher (vc-finish-logentry): Don't mess with the windows/frames.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 030d2f4fed9..f1e01fef591 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-04-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* vc-dispatcher.el (vc-finish-logentry): Don't mess so badly with the
+	windows/frames.
+
 	* emacs-lisp/lisp.el (lisp-completion-at-point): Complete around point.
 	I.e. include text after point in the completion region.
 	Also, return nil when we're not after/in a symbol.
diff --git a/lisp/vc-dispatcher.el b/lisp/vc-dispatcher.el
index 80a0f5dddcd..f061af46b8c 100644
--- a/lisp/vc-dispatcher.el
+++ b/lisp/vc-dispatcher.el
@@ -599,8 +599,7 @@ the buffer contents as a comment."
 	(log-extra vc-log-extra)
 	(log-entry (buffer-string))
 	(extra-flags log-edit-extra-flags)
-	(after-hook vc-log-after-operation-hook)
-	(tmp-vc-parent-buffer vc-parent-buffer))
+	(after-hook vc-log-after-operation-hook))
     (pop-to-buffer vc-parent-buffer)
     ;; OK, do it to it
     (save-excursion
@@ -617,9 +616,11 @@ the buffer contents as a comment."
 	   (delete-windows-on logbuf (selected-frame))
 	   ;; Kill buffer and delete any other dedicated windows/frames.
 	   (kill-buffer logbuf))
-	  (logbuf (pop-to-buffer logbuf)
-		  (bury-buffer)
-		  (pop-to-buffer tmp-vc-parent-buffer)))
+	  (logbuf
+           (with-selected-window (or (get-buffer-window logbuf 0)
+                                     (selected-window))
+             (with-current-buffer logbuf
+               (bury-buffer)))))
     ;; Now make sure we see the expanded headers
     (when log-fileset
       (mapc