diff options
| author | André Spiegel <spiegel@gnu.org> | 2005-01-09 21:30:56 +0000 |
|---|---|---|
| committer | André Spiegel <spiegel@gnu.org> | 2005-01-09 21:30:56 +0000 |
| commit | 2d4e93b91e2a7c7d71124d466dea7fe40572ff9f (patch) | |
| tree | 15fbbb4549b5d6f24cca4568a229cefc313f4003 /lisp | |
| parent | fb7454e809b19673030c2fc9640e6f0b768737f4 (diff) | |
| download | emacs-2d4e93b91e2a7c7d71124d466dea7fe40572ff9f.tar.gz | |
(vc-svn-diff): Don't diff asynchronously if vc-disable-async-diff is
t.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/vc-svn.el | 3 |
1 files changed, 2 insertions, 1 deletions
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 |