1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00

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

t.
This commit is contained in:
André Spiegel 2005-01-09 21:30:56 +00:00
parent fb7454e809
commit 2d4e93b91e

View file

@ -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