[Emacs-diffs] Changes to emacs/lisp/vc-mcvs.el

[Stefan Monnier]

Index: emacs/lisp/vc-mcvs.el
diff -c emacs/lisp/vc-mcvs.el:1.9 emacs/lisp/vc-mcvs.el:1.10
*** emacs/lisp/vc-mcvs.el:1.9   Sun May 11 19:55:07 2003
--- emacs/lisp/vc-mcvs.el       Tue May 13 09:52:45 2003
***************
*** 116,129 ****
  ;;;###autoload (defun vc-mcvs-registered (file)
  ;;;###autoload   (let ((dir file))
  ;;;###autoload     (while (and (stringp dir)
! ;;;###autoload                (not (equal dir (setq dir (file-name-directory 
dir)))))
  ;;;###autoload       (setq dir (if (file-directory-p
! ;;;###autoload                     (expand-file-name "MCVS/CVS" dir))
! ;;;###autoload                    t (directory-file-name dir))))
  ;;;###autoload     (if (eq dir t)
! ;;;###autoload        (progn
! ;;;###autoload          (load "vc-mcvs")
! ;;;###autoload          (vc-mcvs-registered file)))))
  
  (defun vc-mcvs-root (file)
    "Return the root directory of a Meta-CVS project, if any."
--- 116,131 ----
  ;;;###autoload (defun vc-mcvs-registered (file)
  ;;;###autoload   (let ((dir file))
  ;;;###autoload     (while (and (stringp dir)
! ;;;###autoload                 (not (equal
! ;;;###autoload                       dir (setq dir (file-name-directory 
dir))))
! ;;;###autoload                 dir)
  ;;;###autoload       (setq dir (if (file-directory-p
! ;;;###autoload                      (expand-file-name "MCVS/CVS" dir))
! ;;;###autoload                     t (directory-file-name dir))))
  ;;;###autoload     (if (eq dir t)
! ;;;###autoload          (progn
! ;;;###autoload           (load "vc-mcvs")
! ;;;###autoload           (vc-mcvs-registered file)))))
  
  (defun vc-mcvs-root (file)
    "Return the root directory of a Meta-CVS project, if any."
***************
*** 132,138 ****
         file 'mcvs-root
         (let ((root nil))
         (while (not (or root
!                        (equal file (setq file (file-name-directory file)))))
           (if (file-directory-p (expand-file-name "MCVS/CVS" file))
               (setq root file)
             (setq file (directory-file-name file))))
--- 134,141 ----
         file 'mcvs-root
         (let ((root nil))
         (while (not (or root
!                        (equal file (setq file (file-name-directory file)))
!                        (null file)))
           (if (file-directory-p (expand-file-name "MCVS/CVS" file))
               (setq root file)
             (setq file (directory-file-name file))))