diff options
| author | André Spiegel <spiegel@gnu.org> | 2005-01-09 21:29:27 +0000 |
|---|---|---|
| committer | André Spiegel <spiegel@gnu.org> | 2005-01-09 21:29:27 +0000 |
| commit | 160a154482df404ae37d64abfcc3d81b5bce23f5 (patch) | |
| tree | 99d3328888c3005d54bb6c6dee33ea58fe1e714f | |
| parent | 92bafc3058d62344610c2584f1f83edab56d4f4b (diff) | |
| download | emacs-160a154482df404ae37d64abfcc3d81b5bce23f5.tar.gz | |
(vc-arch-diff): Don't diff asynchronously if vc-disable-async-diff is
t.
| -rw-r--r-- | lisp/vc-arch.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc-arch.el b/lisp/vc-arch.el index 40ec2fb3884..b821928c539 100644 --- a/lisp/vc-arch.el +++ b/lisp/vc-arch.el @@ -377,7 +377,7 @@ Return non-nil if FILE is unchanged." (setq newvers nil)) (if newvers (error "Diffing specific revisions not implemented.") - (let* ((async (fboundp 'start-process)) + (let* ((async (and (not vc-disable-async-diff) (fboundp 'start-process))) ;; Run the command from the root dir. (default-directory (vc-arch-root file)) (status |