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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 030d2f4fed9f79e56581bbf929be25ad49513ac0..f1e01fef5911141002d44b844152bb04cdba2b9d 100644 (file)
--- 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 80a0f5dddcd70ce984bfbb7eac1265553af074aa..f061af46b8c9756e839fc171a9344fa523bf1e25 100644 (file)
--- 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