diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/files.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4c3b2d696db..07fa73f582b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-02-19 Stefan Monnier <monnier@iro.umontreal.ca> + + * files.el (locate-dominating-file): Fix thinko in last change. + Reported by Bruce Stephens <bruce.stephens@isode.com>. + 2008-02-18 Dan Nicolaescu <dann@ics.uci.edu> * vc.el (vc-status-mode-menu): New menu for vc-status. diff --git a/lisp/files.el b/lisp/files.el index 82f190a013f..3950d5e7195 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -742,7 +742,7 @@ PATH-AND-SUFFIXES is a pair of lists, (DIRECTORIES . SUFFIXES)." ;; files inside a project belong to the same user. (let ((prev-user user)) (setq user (nth 2 (file-attributes file))) - (not (or (null prev-user) (equal user prev-user))))) + (or (null prev-user) (equal user prev-user)))) (if (setq files (directory-files dir 'full regexp)) (throw 'found (car files)) (if (equal dir |