[Emacs-diffs] Changes to emacs/lisp/vc.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/11/15 16:33:09

Index: vc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc.el,v
retrieving revision 1.481
retrieving revision 1.482
diff -u -b -r1.481 -r1.482
--- vc.el       13 Nov 2007 15:11:41 -0000      1.481
+++ vc.el       15 Nov 2007 16:33:07 -0000      1.482
@@ -1938,13 +1938,14 @@
         (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)))