summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThierry Volpiatto <thierry.volpiatto@gmail.com>2011-09-02 00:54:34 -0700
committerGlenn Morris <rgm@gnu.org>2011-09-02 00:54:34 -0700
commit81ec0c88f2f27c090c5928f78a9c6afb8c1b2f72 (patch)
tree4961ab0efdf799f389b9c828f440b71a4d99a09d
parent2a7bdc1a6f23854cbac90a29907367a1b8cd54d9 (diff)
downloademacs-81ec0c88f2f27c090c5928f78a9c6afb8c1b2f72.tar.gz
Add missing piece of earlier commit.
* lisp/vc/vc-rcs.el (vc-rcs-responsible-p): Handle directories. Fixes: debbugs:9391
-rw-r--r--lisp/vc/vc-rcs.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index 488efaa3522..8051009a983 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -314,7 +314,10 @@ expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile."
(defun vc-rcs-responsible-p (file)
"Return non-nil if RCS thinks it would be responsible for registering FILE."
;; TODO: check for all the patterns in vc-rcs-master-templates
- (file-directory-p (expand-file-name "RCS" (file-name-directory file))))
+ (file-directory-p (expand-file-name "RCS"
+ (if (file-directory-p file)
+ file
+ (file-name-directory file)))))
(defun vc-rcs-receive-file (file rev)
"Implementation of receive-file for RCS."