(vc-fetch-master-properties): Pass an absolute

pathname to the cvs status command. This is required to make
recursive vc-directory listings work.

diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 39f94df20a819df0fbc3279c20d22f18376f381a..144fd7f91470b42d20cdce76a9fffc439aacd1d0 100644 (file)
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -38,6 +38,10 @@
   "*Back-end actually used by this interface; may be SCCS or RCS.
 The value is only computed when needed to avoid an expensive search.")
 
+(defvar vc-handle-cvs t
+  "*If non-nil, use VC for files managed with CVS.
+If it is nil, don't use VC for those files.")
+
 (defvar vc-path
   (if (file-directory-p "/usr/sccs")
       '("/usr/sccs")
@@ -285,7 +289,7 @@ value of this flag.")
                           (mapconcat 'identity vc-path path-separator))
                   process-environment)))
        (apply 'call-process "cvs" nil "*vc-info*" nil 
-              (list "status" (file-name-nondirectory file))))
+              (list "status" file)))
       (set-buffer (get-buffer "*vc-info*"))
       (set-buffer-modified-p nil)
       (auto-save-mode nil)
@@ -650,7 +654,8 @@ value of this flag.")
   ;; the MASTER will not actually exist yet.  The other parts of VC
   ;; checks for this condition.  This function returns nil if 
   ;; DIRNAME/BASENAME is not handled by CVS.
-  (if (and (file-directory-p (concat dirname "CVS/"))
+  (if (and vc-handle-cvs
+          (file-directory-p (concat dirname "CVS/"))
           (file-readable-p (concat dirname "CVS/Entries"))
           (file-readable-p (concat dirname "CVS/Repository")))
       (let ((bufs nil) (fold case-fold-search))