(vc-diff-internal): Pop-to-buffer later.

2 files changed, 4 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index baf66e2007a..a88e4fecca1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2007-11-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * vc.el (vc-diff-internal): Pop-to-buffer later.
+
         * subr.el (event-modifiers): Use internal-event-symbol-parse-modifiers.
 
         * pcvs.el (cvs-revert-if-needed): Ignore `unknown' files, since cvs
diff --git a/lisp/vc.el b/lisp/vc.el
index 39bf68ac310..f2c0017e8cf 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -1938,13 +1938,14 @@ returns t if the buffer had changes, nil otherwise."
         (progn
           (message "No changes between %s and %s" rev1-name rev2-name)
           nil)
-      (pop-to-buffer (current-buffer))
       (diff-mode)
       ;; Make the *vc-diff* buffer read only, the diff-mode key
       ;; bindings are nicer for read only buffers. pcl-cvs does the
       ;; same thing.
       (setq buffer-read-only t)
       (vc-exec-after `(vc-diff-sentinel ,verbose ,rev1-name ,rev2-name))
+      ;; Display the buffer, but at the end because it can change point.
+      (pop-to-buffer (current-buffer))
       ;; In the async case, we return t even if there are no differences
       ;; because we don't know that yet.
       t)))