# HG changeset patch # User Andr Spiegel # Date 1105306256 0 # Node ID 1ba18e6577963eb93ffd19aae0e8da865d4fc79a # Parent 73a45ff77795474411bbfc4b63aa716cd0fe7ca4 (vc-svn-diff): Don't diff asynchronously if vc-disable-async-diff is t. diff -r 73a45ff77795 -r 1ba18e657796 lisp/vc-svn.el --- a/lisp/vc-svn.el Sun Jan 09 21:29:54 2005 +0000 +++ b/lisp/vc-svn.el Sun Jan 09 21:30:56 2005 +0000 @@ -372,7 +372,8 @@ (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