diff lisp/vc.el @ 69943:7d69833e0c1a

(vc-ensure-vc-buffer): Only change current-buffer, not the window config. (vc-annotate-display-select): Select the buffer so that current-buffer (and selected-window) is the output buffer at the end of vc-annotate.

--- a/lisp/vc.el	Tue Apr 11 22:09:49 2006 +0000
+++ b/lisp/vc.el	Tue Apr 11 23:05:31 2006 +0000
@@ -886,7 +886,7 @@
   (if vc-dired-mode
       (set-buffer (find-file-noselect (dired-get-filename)))
     (while vc-parent-buffer
-      (pop-to-buffer vc-parent-buffer))
+      (set-buffer vc-parent-buffer))
     (if (not buffer-file-name)
 	(error "Buffer %s is not associated with a file" (buffer-name))
       (if (not (vc-backend buffer-file-name))
@@ -3047,9 +3047,7 @@
 use; you may override this using the second optional arg MODE."
   (interactive)
   (if mode (setq vc-annotate-display-mode mode))
-  (when buffer
-    (set-buffer buffer)
-    (display-buffer buffer))
+  (pop-to-buffer (or buffer (current-buffer)))
   (cond ((null vc-annotate-display-mode)
          ;; The ratio is global, thus relative to the global color-map.
          (kill-local-variable 'vc-annotate-color-map)