diff options
| -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 @@ | |||
| 1 | 2008-02-19 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * files.el (locate-dominating-file): Fix thinko in last change. | ||
| 4 | Reported by Bruce Stephens <bruce.stephens@isode.com>. | ||
| 5 | |||
| 1 | 2008-02-18 Dan Nicolaescu <dann@ics.uci.edu> | 6 | 2008-02-18 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 7 | ||
| 3 | * vc.el (vc-status-mode-menu): New menu for vc-status. | 8 | * 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)." | |||
| 742 | ;; files inside a project belong to the same user. | 742 | ;; files inside a project belong to the same user. |
| 743 | (let ((prev-user user)) | 743 | (let ((prev-user user)) |
| 744 | (setq user (nth 2 (file-attributes file))) | 744 | (setq user (nth 2 (file-attributes file))) |
| 745 | (not (or (null prev-user) (equal user prev-user))))) | 745 | (or (null prev-user) (equal user prev-user)))) |
| 746 | (if (setq files (directory-files dir 'full regexp)) | 746 | (if (setq files (directory-files dir 'full regexp)) |
| 747 | (throw 'found (car files)) | 747 | (throw 'found (car files)) |
| 748 | (if (equal dir | 748 | (if (equal dir |