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

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

diff --git a/lisp/vc-arch.el b/lisp/vc-arch.el
index 40ec2fb3884..b821928c539 100644
--- a/lisp/vc-arch.el
+++ b/lisp/vc-arch.el
@@ -377,7 +377,7 @@ Return non-nil if FILE is unchanged."
       (setq newvers nil))
   (if newvers
       (error "Diffing specific revisions not implemented.")
-    (let* ((async (fboundp 'start-process))
+    (let* ((async (and (not vc-disable-async-diff) (fboundp 'start-process)))
 	   ;; Run the command from the root dir.
 	   (default-directory (vc-arch-root file))
 	   (status