diff options
| author | André Spiegel <spiegel@gnu.org> | 2005-01-09 21:29:54 +0000 |
|---|---|---|
| committer | André Spiegel <spiegel@gnu.org> | 2005-01-09 21:29:54 +0000 |
| commit | fb7454e809b19673030c2fc9640e6f0b768737f4 (patch) | |
| tree | 1242f7df4bd877bd14b839a5c94c9bc69f6142b1 /lisp/vc-mcvs.el | |
| parent | 160a154482df404ae37d64abfcc3d81b5bce23f5 (diff) | |
| download | emacs-fb7454e809b19673030c2fc9640e6f0b768737f4.tar.gz | |
(vc-mcvs-diff): Don't diff asynchronously if vc-disable-async-diff is
t.
Diffstat (limited to 'lisp/vc-mcvs.el')
| -rw-r--r-- | lisp/vc-mcvs.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/vc-mcvs.el b/lisp/vc-mcvs.el index ea577489239..aca8bcd66f0 100644 --- a/lisp/vc-mcvs.el +++ b/lisp/vc-mcvs.el @@ -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)) |