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

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

diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index 553024f636d..f783066b39b 100644
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -372,7 +372,8 @@ The changes are between FIRST-VERSION and SECOND-VERSION."
 	    (if vc-svn-diff-switches
 		(vc-switches 'SVN 'diff)
 	      (list "-x" (mapconcat 'identity (vc-switches nil 'diff) " "))))
-	   (async (and (vc-stay-local-p file)
+	   (async (and (not vc-disable-async-diff)
+                       (vc-stay-local-p file)
 		       (or oldvers newvers) ; Svn diffs those locally.
 		       (fboundp 'start-process))))
       (apply 'vc-svn-command buffer