(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 553024f636d21babc55e7c084ee7bba42875c1a7..f783066b39b48c9dd8e4b7deeaff5285a465a4c4 100644 (file)
--- 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