aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2008-09-29 11:31:10 +0000
committerEli Zaretskii2008-09-29 11:31:10 +0000
commit69ad666d70dbf92ab66b4aaa291e8d806514b9e3 (patch)
treed2f01bcef4c1dcd66caed6b91b3412a6e9d7c90f
parentd5fb39b4c6723ceef19e92ca70f4f01371ff5592 (diff)
downloademacs-69ad666d70dbf92ab66b4aaa291e8d806514b9e3.tar.gz
emacs-69ad666d70dbf92ab66b4aaa291e8d806514b9e3.zip
(locate-dominating-file): Take file-attributes of `dir', not of `file'
(which never changes).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/files.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f8af9ff09cf..3a1b8ade9c8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-09-29 Eli Zaretskii <eliz@gnu.org>
2
3 * files.el (locate-dominating-file): Take file-attributes of
4 `dir', not of `file' (which never changes).
5
12008-09-29 Michael Albinus <michael.albinus@gmx.de> 62008-09-29 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * files.el (file-remote-p): Precise doc string; IDENTIFICATION can 8 * files.el (file-remote-p): Precise doc string; IDENTIFICATION can
diff --git a/lisp/files.el b/lisp/files.el
index 0abe462316e..f00c265ed6e 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -732,7 +732,7 @@ PATH-AND-SUFFIXES is a pair of lists, (DIRECTORIES . SUFFIXES)."
732 ;; things like /net and /afs. This assumes that all the 732 ;; things like /net and /afs. This assumes that all the
733 ;; files inside a project belong to the same user. 733 ;; files inside a project belong to the same user.
734 (let ((prev-user user)) 734 (let ((prev-user user))
735 (setq user (nth 2 (file-attributes file))) 735 (setq user (nth 2 (file-attributes dir)))
736 (or (null prev-user) (equal user prev-user)))) 736 (or (null prev-user) (equal user prev-user))))
737 (if (setq files (and (file-directory-p dir) 737 (if (setq files (and (file-directory-p dir)
738 (directory-files dir 'full regexp))) 738 (directory-files dir 'full regexp)))