(locate-dominating-file): Take file-attributes of `dir', not of `file'

(which never changes).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f8af9ff09cfdfeb719f96688ad05edd6c479e50d..3a1b8ade9c8bd1aeb2b523868496ad5110cac477 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-29  Eli Zaretskii  <eliz@gnu.org>
+
+       * files.el (locate-dominating-file): Take file-attributes of
+       `dir', not of `file' (which never changes).
+
 2008-09-29  Michael Albinus  <michael.albinus@gmx.de>
 
        * files.el (file-remote-p): Precise doc string; IDENTIFICATION can

diff --git a/lisp/files.el b/lisp/files.el
index 0abe462316ee22ea65f09bfc5f3ebdbcd6ee69e5..f00c265ed6e2a9aabc2001252c341a31b26b8aed 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -732,7 +732,7 @@ PATH-AND-SUFFIXES is a pair of lists, (DIRECTORIES . SUFFIXES)."
                   ;; things like /net and /afs.  This assumes that all the
                   ;; files inside a project belong to the same user.
                   (let ((prev-user user))
-                    (setq user (nth 2 (file-attributes file)))
+                    (setq user (nth 2 (file-attributes dir)))
                     (or (null prev-user) (equal user prev-user))))
         (if (setq files (and (file-directory-p dir)
                              (directory-files dir 'full regexp)))