Mercurial > emacs

changeset 59446:1ba18e657796

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-svn-diff): Don't diff asynchronously if vc-disable-async-diff is t.
author André Spiegel <spiegel@gnu.org>
date Sun, 09 Jan 2005 21:30:56 +0000
parents 73a45ff77795
children 56133222a4e2
files lisp/vc-svn.el
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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