Mercurial > emacs
diff lisp/vc-cvs.el @ 59443:fd6e4e55ca84
(vc-cvs-diff): Don't diff asynchronously if vc-disable-async-diff is
t.
author | André Spiegel <spiegel@gnu.org> |
---|---|
date | Sun, 09 Jan 2005 21:28:53 +0000 |
parents | 0241e1689d7f |
children | aac0a33f5772 3dcba0bc766b cb67264d6096 |
line wrap: on
line diff
--- a/lisp/vc-cvs.el Sun Jan 09 21:27:28 2005 +0000 +++ b/lisp/vc-cvs.el Sun Jan 09 21:28:53 2005 +0000 @@ -548,7 +548,9 @@ (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"