Mercurial > emacs
diff lisp/vc-cvs.el @ 91085:880960b70474
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 11 Nov 2007 00:56:44 +0000 |
parents | 4b09bb044f38 613df1ba1584 |
children | 53108e6cea98 |
line wrap: on
line diff
--- a/lisp/vc-cvs.el Fri Nov 09 14:52:32 2007 +0000 +++ b/lisp/vc-cvs.el Sun Nov 11 00:56:44 2007 +0000 @@ -503,7 +503,7 @@ "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 @@ (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 @@ "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)))