comparison lisp/vc-mcvs.el @ 50963:575459cc44fb

(vc-mcvs-registered, vc-mcvs-root): Check if file-name-directory returns nil.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Tue, 13 May 2003 13:52:45 +0000
parents 1731748fbe8c
children 695cf19ef79e
comparison
equal deleted inserted replaced
50962:8a38e6c7aa44 50963:575459cc44fb
114 ;;; 114 ;;;
115 115
116 ;;;###autoload (defun vc-mcvs-registered (file) 116 ;;;###autoload (defun vc-mcvs-registered (file)
117 ;;;###autoload (let ((dir file)) 117 ;;;###autoload (let ((dir file))
118 ;;;###autoload (while (and (stringp dir) 118 ;;;###autoload (while (and (stringp dir)
119 ;;;###autoload (not (equal dir (setq dir (file-name-directory dir))))) 119 ;;;###autoload (not (equal
120 ;;;###autoload dir (setq dir (file-name-directory dir))))
121 ;;;###autoload dir)
120 ;;;###autoload (setq dir (if (file-directory-p 122 ;;;###autoload (setq dir (if (file-directory-p
121 ;;;###autoload (expand-file-name "MCVS/CVS" dir)) 123 ;;;###autoload (expand-file-name "MCVS/CVS" dir))
122 ;;;###autoload t (directory-file-name dir)))) 124 ;;;###autoload t (directory-file-name dir))))
123 ;;;###autoload (if (eq dir t) 125 ;;;###autoload (if (eq dir t)
124 ;;;###autoload (progn 126 ;;;###autoload (progn
125 ;;;###autoload (load "vc-mcvs") 127 ;;;###autoload (load "vc-mcvs")
126 ;;;###autoload (vc-mcvs-registered file))))) 128 ;;;###autoload (vc-mcvs-registered file)))))
127 129
128 (defun vc-mcvs-root (file) 130 (defun vc-mcvs-root (file)
129 "Return the root directory of a Meta-CVS project, if any." 131 "Return the root directory of a Meta-CVS project, if any."
130 (or (vc-file-getprop file 'mcvs-root) 132 (or (vc-file-getprop file 'mcvs-root)
131 (vc-file-setprop 133 (vc-file-setprop
132 file 'mcvs-root 134 file 'mcvs-root
133 (let ((root nil)) 135 (let ((root nil))
134 (while (not (or root 136 (while (not (or root
135 (equal file (setq file (file-name-directory file))))) 137 (equal file (setq file (file-name-directory file)))
138 (null file)))
136 (if (file-directory-p (expand-file-name "MCVS/CVS" file)) 139 (if (file-directory-p (expand-file-name "MCVS/CVS" file))
137 (setq root file) 140 (setq root file)
138 (setq file (directory-file-name file)))) 141 (setq file (directory-file-name file))))
139 root)))) 142 root))))
140 143