2 files changed, 9 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 437b39a60aa..779c2093846 100644
--- 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 809b49a4d0e..19b309ee203 100644
--- 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))))