diff options
| author | André Spiegel <spiegel@gnu.org> | 2005-01-09 21:28:53 +0000 |
|---|---|---|
| committer | André Spiegel <spiegel@gnu.org> | 2005-01-09 21:28:53 +0000 |
| commit | 92bafc3058d62344610c2584f1f83edab56d4f4b (patch) | |
| tree | 4b82ae935b64d09f578b43631bea469cafd91649 /lisp/vc-cvs.el | |
| parent | f1d1d46a52739c06b484d13964e6ae9521492281 (diff) | |
| download | emacs-92bafc3058d62344610c2584f1f83edab56d4f4b.tar.gz emacs-92bafc3058d62344610c2584f1f83edab56d4f4b.tar.bz2 emacs-92bafc3058d62344610c2584f1f83edab56d4f4b.zip | |
(vc-cvs-diff): Don't diff asynchronously if vc-disable-async-diff is
t.
Diffstat (limited to 'lisp/vc-cvs.el')
| -rw-r--r-- | lisp/vc-cvs.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index 22346cab68c..2bca3fb90b1 100644 --- a/lisp/vc-cvs.el +++ b/lisp/vc-cvs.el @@ -548,7 +548,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))) (status (apply 'vc-cvs-command (or buffer "*vc-diff*") (if async 'async 1) file "diff" |