From: Lars Ingebrigtsen Date: Sun, 9 Feb 2014 02:58:24 +0000 (-0800) Subject: (locate-file): Suffixes aren't returned, so don't say that they are X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~80 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5a836f589706c06b840a061780e08fd94243fea2;p=emacs.git (locate-file): Suffixes aren't returned, so don't say that they are Fixes: debbugs:12674 --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 205cfa319cd..be72db024e5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -2,6 +2,8 @@ * files.el (find-file-noselect): Clarify prompt when changing readedness (bug#13261). + (locate-file): Suffixes aren't returned, so don't say that they + are (bug#12674). * dired.el (dired-internal-do-deletions): Don't say "Deleting..." before we actually start to delete things (bug#16331). diff --git a/lisp/files.el b/lisp/files.el index 38113bc6388..0cd4c29e1ef 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -747,8 +747,8 @@ The path separator is colon in GNU and GNU-like systems." (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. +If found, return the absolute file name of FILENAME; 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