From: André Spiegel <spiegel@gnu.org>
Date: Sun, 9 Jan 2005 21:28:53 +0000 (+0000)
Subject: (vc-cvs-diff): Don't diff asynchronously if vc-disable-async-diff is
X-Git-Tag: ttn-vms-21-2-B4~2843
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=92bafc3058d62344610c2584f1f83edab56d4f4b;p=emacs.git

(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 22346cab68c..2bca3fb90b1 100644
--- 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"