# HG changeset patch
# User André Spiegel <spiegel@gnu.org>
# Date 1105306194 0
# Node ID 73a45ff77795474411bbfc4b63aa716cd0fe7ca4
# Parent  5173e8c74cae28f49b7b49479e68aa011a7a7ed0
(vc-mcvs-diff): Don't diff asynchronously if vc-disable-async-diff is
t.

diff -r 5173e8c74cae -r 73a45ff77795 lisp/vc-mcvs.el
--- a/lisp/vc-mcvs.el	Sun Jan 09 21:29:27 2005 +0000
+++ b/lisp/vc-mcvs.el	Sun Jan 09 21:29:54 2005 +0000
@@ -446,7 +446,9 @@
 	       (append (vc-switches nil 'diff) '("/dev/null")))
 	;; Even if it's empty, it's locally modified.
 	1)
-    (let* ((async (and (vc-stay-local-p file) (fboundp 'start-process)))
+    (let* ((async (and (not vc-disable-async-diff)
+                       (vc-stay-local-p file) 
+                       (fboundp 'start-process)))
 	   ;; Run the command from the root dir so that `mcvs filt' returns
 	   ;; valid relative names.
 	   (default-directory (vc-mcvs-root file))