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

t.

diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index 22346cab68c8192e959558ae14130e17cb529611..2bca3fb90b1789c5ae8e472073479c8b40ac6d13 100644 (file)
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -548,7 +548,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)))
           (status (apply 'vc-cvs-command (or buffer "*vc-diff*")
                          (if async 'async 1)
                          file "diff"