# HG changeset patch
# User Andr��� Spiegel <spiegel@gnu.org>
# Date 1105306133 0
# Node ID fd6e4e55ca843075cdb3b5bae4e614004db231b8
# Parent  37d47d9bf8b1883835488ce67ab4bd3fdf5f873e
(vc-cvs-diff): Don't diff asynchronously if vc-disable-async-diff is
t.

diff -r 37d47d9bf8b1 -r fd6e4e55ca84 lisp/vc-cvs.el
--- a/lisp/vc-cvs.el	Sun Jan 09 21:27:28 2005 +0000
+++ b/lisp/vc-cvs.el	Sun Jan 09 21:28:53 2005 +0000
@@ -548,7 +548,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)))
 	   (status (apply 'vc-cvs-command (or buffer "*vc-diff*")
 			  (if async 'async 1)
 			  file "diff"