+2011-07-10 Bob Rogers <rogers@rgrjr.dyndns.org>
+
+ * vc/vc.el (vc-diff-internal): Fix race condition (Bug#1256).
+
2011-07-10 Chong Yidong <cyd@stupidchicken.com>
* window.el (display-buffer): Fix arguments to
;; bindings are nicer for read only buffers. pcl-cvs does the
;; same thing.
(setq buffer-read-only t)
- (vc-exec-after `(vc-diff-finish ,(current-buffer) ',(when verbose
- messages)))
;; Display the buffer, but at the end because it can change point.
(pop-to-buffer (current-buffer))
+ ;; The diff process may finish early, so call `vc-diff-finish'
+ ;; after `pop-to-buffer'; the former assumes the diff buffer is
+ ;; shown in some window.
+ (vc-exec-after `(vc-diff-finish ,(current-buffer)
+ ',(when verbose messages)))
;; In the async case, we return t even if there are no differences
;; because we don't know that yet.
t)))