diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/vc-cvs.el | 13 |
2 files changed, 15 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f2e0cf1512..9d8dbcbdd1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2001-04-17 Eli Zaretskii <[email protected]> + + * vc-cvs.el (vc-cvs-print-log, vc-cvs-diff): Don't invoke CVS as + an async subprocess if start-process is unavailable. Suggested by + Tim Van Holder <[email protected]>. + 2001-04-15 Eli Zaretskii <[email protected]> * info.el (Info-additional-directory-list): Doc fix. Suggested by diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index 8c6805d675..6131b9af9e 100644 --- a/lisp/vc-cvs.el +++ b/lisp/vc-cvs.el @@ -5,7 +5,7 @@ ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel <[email protected]> -;; $Id: vc-cvs.el,v 1.20 2001/02/02 07:21:21 spiegel Exp $ +;; $Id: vc-cvs.el,v 1.21 2001/03/10 10:49:05 spiegel Exp $ ;; This file is part of GNU Emacs. @@ -461,8 +461,10 @@ The changes are between FIRST-VERSION and SECOND-VERSION." (defun vc-cvs-print-log (file) "Get change log associated with FILE." - (vc-do-command nil (if (vc-cvs-stay-local-p file) 'async 0) - "cvs" file "log")) + (vc-do-command + nil + (if (and (vc-cvs-stay-local-p file) (fboundp 'start-process)) 'async 0) + "cvs" file "log")) (defun vc-cvs-show-log-entry (version) (when (re-search-forward @@ -509,7 +511,10 @@ The changes are between FIRST-VERSION and SECOND-VERSION." (append diff-switches-list '("/dev/null")))) (setq status (apply 'vc-do-command "*vc-diff*" - (if (vc-cvs-stay-local-p file) 'async 1) + (if (and (vc-cvs-stay-local-p file) + (fboundp 'start-process)) + 'async + 1) "cvs" file "diff" (and oldvers (concat "-r" oldvers)) (and newvers (concat "-r" newvers)) |