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

of calling file-directory-p, which stats the directory one more time.
This commit is contained in:
Eli Zaretskii 2008-09-30 12:52:46 +00:00
parent f45de83bf8
commit a03c5807a3
2 changed files with 7 additions and 2 deletions

View file

@ -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.

View file

@ -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