aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2014-02-08 18:58:24 -0800
committerLars Ingebrigtsen2014-02-08 18:58:24 -0800
commit5a836f589706c06b840a061780e08fd94243fea2 (patch)
tree5a28c86fbec1338b03252c0345c88803e78ac570
parent9e108fe61dc95eb6ce647366a104b098ec5053c5 (diff)
downloademacs-5a836f589706c06b840a061780e08fd94243fea2.tar.gz
emacs-5a836f589706c06b840a061780e08fd94243fea2.zip
(locate-file): Suffixes aren't returned, so don't say that they are
Fixes: debbugs:12674
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/files.el4
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 205cfa319cd..be72db024e5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,8 @@
2 2
3 * files.el (find-file-noselect): Clarify prompt when changing 3 * files.el (find-file-noselect): Clarify prompt when changing
4 readedness (bug#13261). 4 readedness (bug#13261).
5 (locate-file): Suffixes aren't returned, so don't say that they
6 are (bug#12674).
5 7
6 * dired.el (dired-internal-do-deletions): Don't say "Deleting..." 8 * dired.el (dired-internal-do-deletions): Don't say "Deleting..."
7 before we actually start to delete things (bug#16331). 9 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."
747 747
748(defun locate-file (filename path &optional suffixes predicate) 748(defun locate-file (filename path &optional suffixes predicate)
749 "Search for FILENAME through PATH. 749 "Search for FILENAME through PATH.
750If found, return the absolute file name of FILENAME, with its suffixes; 750If found, return the absolute file name of FILENAME; otherwise
751otherwise return nil. 751return nil.
752PATH should be a list of directories to look in, like the lists in 752PATH should be a list of directories to look in, like the lists in
753`exec-path' or `load-path'. 753`exec-path' or `load-path'.
754If SUFFIXES is non-nil, it should be a list of suffixes to append to 754If SUFFIXES is non-nil, it should be a list of suffixes to append to