(vc-find-root): Walk up the tree to find an existing

`file' from which to start the search.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 437b39a60aa39859df37d755326cb73be3f1993e..779c2093846a933719e17c2a99059c557509f75a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,14 @@
+2007-07-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * vc-hooks.el (vc-find-root): Walk up the tree to find an existing
+       `file' from which to start the search.
+
 2007-07-19  Eric S. Raymond  <esr@snark.thyrsus.com>
 
-       * vc-cvs.el: vc-cvs-checkin had some reference problems, now
-       fixed.
-       
+       * vc-cvs.el: vc-cvs-checkin had some reference problems, now fixed.
 
 2007-07-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
        * files.el (locate-dominating-file): New function.
 
 2007-07-18  Michael Albinus  <michael.albinus@gmx.de>

diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 809b49a4d0e69325960f32e158cd4c0daa1cc49c..19b309ee203123068feae3c558091c9c45393d81 100644 (file)
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -317,6 +317,8 @@ The function walks up the directory tree from FILE looking for WITNESS.
 If WITNESS if not found, return nil, otherwise return the root."
   ;; Represent /home/luser/foo as ~/foo so that we don't try to look for
   ;; witnesses in /home or in /.
+  (while (not (file-exists-p file))
+    (setq file (file-name-directory (directory-file-name file))))
   (setq file (abbreviate-file-name file))
   (let ((root nil)
         (user (nth 2 (file-attributes file))))