diff options
| author | Miles Bader <miles@gnu.org> | 2007-11-11 00:56:44 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-11-11 00:56:44 +0000 |
| commit | f23d76bdefbd4c06e14d69e99e50d35ce91c8226 (patch) | |
| tree | ded28d1da6df2d0135514bac83074f4ca1c9099a /lisp/vc-cvs.el | |
| parent | e2d092da5980a7d05a5428074f8eb4925fa801e8 (diff) | |
| parent | a457417ee5ba797ab1c91d35ee957bb7a7f8d4b6 (diff) | |
| download | emacs-f23d76bdefbd4c06e14d69e99e50d35ce91c8226.tar.gz emacs-f23d76bdefbd4c06e14d69e99e50d35ce91c8226.tar.bz2 emacs-f23d76bdefbd4c06e14d69e99e50d35ce91c8226.zip | |
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283
Diffstat (limited to 'lisp/vc-cvs.el')
| -rw-r--r-- | lisp/vc-cvs.el | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index 79a4263854d..d6573db9df2 100644 --- a/lisp/vc-cvs.el +++ b/lisp/vc-cvs.el @@ -503,7 +503,7 @@ The changes are between FIRST-REVISION and SECOND-REVISION." "Get change log associated with FILE." (vc-cvs-command buffer - (if (and (vc-stay-local-p files) (fboundp 'start-process)) 'async 0) + (if (vc-stay-local-p files) 'async 0) files "log")) (defun vc-cvs-wash-log () @@ -514,8 +514,7 @@ The changes are between FIRST-REVISION and SECOND-REVISION." (defun vc-cvs-diff (files &optional oldvers newvers buffer) "Get a difference report using CVS between two revisions of FILE." (let* ((async (and (not vc-disable-async-diff) - (vc-stay-local-p files) - (fboundp 'start-process))) + (vc-stay-local-p files))) (status (apply 'vc-cvs-command (or buffer "*vc-diff*") (if async 'async 1) files "diff" @@ -563,7 +562,7 @@ The changes are between FIRST-REVISION and SECOND-REVISION." "Execute \"cvs annotate\" on FILE, inserting the contents in BUFFER. Optional arg REVISION is a revision to annotate from." (vc-cvs-command buffer - (if (and (vc-stay-local-p file) (fboundp 'start-process)) + (if (vc-stay-local-p file) 'async 0) file "annotate" (if revision (concat "-r" revision))) |