(locate-dominating-file): Wrap directory-files with condition-case, instead

of calling file-directory-p, which stats the directory one more time.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0cc37745e43e7140acdc766df5a2b9a7e6530652..844fff225ab427caf8ba9697d6c4ea8aef6afc48 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2008-09-30  Eli Zaretskii  <eliz@gnu.org>
 
+       * files.el (locate-dominating-file): Wrap directory-files with
+       condition-case, instead of calling file-directory-p, which stats
+       the directory one more time.
+
        * mail/mail-utils.el (mail-unquote-printable-region): Use
        insert-byte instead of insert-char, when the UNIBYTE arg is
        non-nil.

diff --git a/lisp/files.el b/lisp/files.el
index f00c265ed6e2a9aabc2001252c341a31b26b8aed..090556663e648dac74454bd29b1680b52c880c44 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -734,8 +734,9 @@ PATH-AND-SUFFIXES is a pair of lists, (DIRECTORIES . SUFFIXES)."
                   (let ((prev-user user))
                     (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)))
+        (if (setq files (condition-case nil
+                           (directory-files dir 'full regexp)
+                         (error nil)))
             (throw 'found (car files))
           (if (equal dir
                      (setq dir (file-name-directory