mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
t.
This commit is contained in:
André Spiegel 2005-01-09 21:29:54 +00:00
parent 160a154482
commit fb7454e809
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/vc-mcvs.el
View file

@ -446,7 +446,9 @@ The changes are between FIRST-VERSION and SECOND-VERSION."
(append (vc-switches nil 'diff) '("/dev/null")))
;; Even if it's empty, it's locally modified.
1)
(let* ((async (and (vc-stay-local-p file) (fboundp 'start-process)))
(let* ((async (and (not vc-disable-async-diff)
(vc-stay-local-p file)
(fboundp 'start-process)))
;; Run the command from the root dir so that `mcvs filt' returns
;; valid relative names.
(default-directory (vc-mcvs-root file))