aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2008-02-19 02:21:08 +0000
committerStefan Monnier2008-02-19 02:21:08 +0000
commita02bf0c3ee9b76c6e24d12481a4afcfbc22ea0b8 (patch)
tree66023e3d892f1a0a700d88bb68b5b95c83f51b44
parent24b2be096fdd8eb9f366b69948b184e1da22d498 (diff)
downloademacs-a02bf0c3ee9b76c6e24d12481a4afcfbc22ea0b8.tar.gz
emacs-a02bf0c3ee9b76c6e24d12481a4afcfbc22ea0b8.zip
(locate-dominating-file): Fix thinko in last change.
Reported by Bruce Stephens <bruce.stephens@isode.com>.
-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 4c3b2d696db..07fa73f582b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-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
12008-02-18 Dan Nicolaescu <dann@ics.uci.edu> 62008-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