(vc-mcvs-diff): Don't diff asynchronously if vc-disable-async-diff is

t.

diff --git a/lisp/vc-mcvs.el b/lisp/vc-mcvs.el
index ea577489239ea8fe2864e7b601315c943e867a8d..aca8bcd66f01c48de43120990387ecc0537b8b01 100644 (file)
--- a/lisp/vc-mcvs.el
+++ b/lisp/vc-mcvs.el
@@ -446,7 +446,9 @@ The changes are between FIRST-VERSION and SECOND-VERSION."
               (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))