diff lisp/files.el @ 83302:5ae8a8b0a308

Merged from [e-mail]--gnu-2005 (patch 292-295) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-292 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-293 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-294 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-295 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-342

--- a/lisp/files.el	Fri May 06 21:06:31 2005 +0000
+++ b/lisp/files.el	Mon May 09 16:13:15 2005 +0000
@@ -632,8 +632,13 @@
 
 (defun locate-file (filename path &optional suffixes predicate)
   "Search for FILENAME through PATH.
+If found, return the absolute file name of FILENAME, with its suffixes;
+otherwise return nil.
+PATH should be a list of directories to look in, like the lists in
+`exec-path' or `load-path'.
 If SUFFIXES is non-nil, it should be a list of suffixes to append to
 file name when searching.  If SUFFIXES is nil, it is equivalent to '(\"\").
+Use '(\"/\") to disable PATH search, but still try the suffixes in SUFFIXES.
 If non-nil, PREDICATE is used instead of `file-readable-p'.
 PREDICATE can also be an integer to pass to the `access' system call,
 in which case file-name handlers are ignored.  This usage is deprecated.