Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 59442:37d47d9bf8b1 | 59443:fd6e4e55ca84 |
|---|---|
| 546 (apply 'vc-do-command (or buffer "*vc-diff*") | 546 (apply 'vc-do-command (or buffer "*vc-diff*") |
| 547 1 "diff" file | 547 1 "diff" file |
| 548 (append (vc-switches nil 'diff) '("/dev/null"))) | 548 (append (vc-switches nil 'diff) '("/dev/null"))) |
| 549 ;; Even if it's empty, it's locally modified. | 549 ;; Even if it's empty, it's locally modified. |
| 550 1) | 550 1) |
| 551 (let* ((async (and (vc-stay-local-p file) (fboundp 'start-process))) | 551 (let* ((async (and (not vc-disable-async-diff) |
| 552 (vc-stay-local-p file) | |
| 553 (fboundp 'start-process))) | |
| 552 (status (apply 'vc-cvs-command (or buffer "*vc-diff*") | 554 (status (apply 'vc-cvs-command (or buffer "*vc-diff*") |
| 553 (if async 'async 1) | 555 (if async 'async 1) |
| 554 file "diff" | 556 file "diff" |
| 555 (and oldvers (concat "-r" oldvers)) | 557 (and oldvers (concat "-r" oldvers)) |
| 556 (and newvers (concat "-r" newvers)) | 558 (and newvers (concat "-r" newvers)) |