(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 <tim.van.holder@pandora.be>.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f2e0cf1512cda2f64c74c2c98169f067df2fa320..9d8dbcbdd129f19e85a6eab9761c4bd7eea331a0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-17  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * 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 <tim.van.holder@pandora.be>.
+
 2001-04-15  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * info.el (Info-additional-directory-list): Doc fix.  Suggested by

diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index 8c6805d6752b1a01c7bee41cae04c017bf8ac940..6131b9af9ed0d79a2fb54ba1e1ac134d4c0e9020 100644 (file)
--- 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 <spiegel@gnu.org>
 
-;; $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))