Mercurial > emacs
comparison lisp/vc-arch.el @ 59444:5173e8c74cae
(vc-arch-diff): Don't diff asynchronously if vc-disable-async-diff is
t.
| author | André Spiegel <spiegel@gnu.org> |
|---|---|
| date | Sun, 09 Jan 2005 21:29:27 +0000 |
| parents | ad91f130fbdf |
| children | 8269aa11cce4 cb67264d6096 |
comparison
equal
deleted
inserted
replaced
| 59443:fd6e4e55ca84 | 59444:5173e8c74cae |
|---|---|
| 375 ;; Newvers is the base revision and the current file is unchanged, | 375 ;; Newvers is the base revision and the current file is unchanged, |
| 376 ;; so we can diff with the current file. | 376 ;; so we can diff with the current file. |
| 377 (setq newvers nil)) | 377 (setq newvers nil)) |
| 378 (if newvers | 378 (if newvers |
| 379 (error "Diffing specific revisions not implemented.") | 379 (error "Diffing specific revisions not implemented.") |
| 380 (let* ((async (fboundp 'start-process)) | 380 (let* ((async (and (not vc-disable-async-diff) (fboundp 'start-process))) |
| 381 ;; Run the command from the root dir. | 381 ;; Run the command from the root dir. |
| 382 (default-directory (vc-arch-root file)) | 382 (default-directory (vc-arch-root file)) |
| 383 (status | 383 (status |
| 384 (vc-arch-command | 384 (vc-arch-command |
| 385 (or buffer "*vc-diff*") | 385 (or buffer "*vc-diff*") |