From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sun, 14 Nov 2021 08:41:22 +0000 (+0100)
Subject: Fix previous -responsible-p change
X-Git-Tag: emacs-29.0.90~2852^2~295
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=06632fbaf81900143aec988a846ee18e33a85e50;p=emacs.git

Fix previous -responsible-p change

* lisp/vc/vc-sccs.el (vc-sccs-responsible-p):
* lisp/vc/vc-rcs.el (vc-rcs-responsible-p):
* lisp/vc/vc-cvs.el (vc-cvs-responsible-p): Make the previous
change work with relative file names, too.
---

diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el
index 7062c4971f8..c8954472245 100644
--- a/lisp/vc/vc-cvs.el
+++ b/lisp/vc/vc-cvs.el
@@ -313,7 +313,7 @@ to the CVS command."
 	         file
 	       (file-name-directory file))))
     (and (file-directory-p (expand-file-name "CVS" dir))
-         dir)))
+         (file-name-directory (expand-file-name "CVS" dir)))))
 
 (defun vc-cvs-could-register (file)
   "Return non-nil if FILE could be registered in CVS.
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index 226e162d8ba..2422e99d3da 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -294,7 +294,7 @@ to the RCS command."
 	         file
 	       (file-name-directory file))))
     (and (file-directory-p (expand-file-name "RCS" dir))
-         dir)))
+         (file-name-directory (expand-file-name "RCS" dir)))))
 
 (defun vc-rcs-receive-file (file rev)
   "Implementation of receive-file for RCS."
diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el
index d59ccb37b3b..4b56fbf28ef 100644
--- a/lisp/vc/vc-sccs.el
+++ b/lisp/vc/vc-sccs.el
@@ -216,7 +216,7 @@ to the SCCS command."
   ;; TODO: check for all the patterns in vc-sccs-master-templates
   (or (and (file-directory-p
             (expand-file-name "SCCS" (file-name-directory file)))
-           file)
+           (file-name-directory file))
       (let ((dir (vc-sccs-search-project-dir (or (file-name-directory file) "")
 					     (file-name-nondirectory file))))
         (and (stringp dir)