aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2012-10-20 20:50:49 +0800
committerChong Yidong2012-10-20 20:50:49 +0800
commitc664f46329c8a18e7a1db89942f2e65a9e7892ac (patch)
tree34b32ecea336be8265ff5a7ee253e466ee442e09 /src
parent4c5d08a8685e51d704f05750cefc718810a289f2 (diff)
downloademacs-c664f46329c8a18e7a1db89942f2e65a9e7892ac.tar.gz
emacs-c664f46329c8a18e7a1db89942f2e65a9e7892ac.zip
* lread.c (Fload): Doc fix.
Fixes: debbugs:12592
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/lread.c23
2 files changed, 15 insertions, 12 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 5a1b4a5d8ee..1a309066703 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-10-20 Chong Yidong <cyd@gnu.org>
2
3 * lread.c (Fload): Doc fix (Bug#12592).
4
12012-10-19 Kazuhiro Ito <kzhr@d1.dion.ne.jp> (tiny change) 52012-10-19 Kazuhiro Ito <kzhr@d1.dion.ne.jp> (tiny change)
2 6
3 * font.c (Ffont_at): Fix previous change. 7 * font.c (Ffont_at): Fix previous change.
diff --git a/src/lread.c b/src/lread.c
index 6d4c0d990af..94744620279 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -996,18 +996,17 @@ If optional fifth arg MUST-SUFFIX is non-nil, insist on
996the suffix `.elc' or `.el'; don't accept just FILE unless 996the suffix `.elc' or `.el'; don't accept just FILE unless
997it ends in one of those suffixes or includes a directory name. 997it ends in one of those suffixes or includes a directory name.
998 998
999If this function fails to find a file, it may look for different 999If NOSUFFIX is nil, then if a file could not be found, try looking for
1000representations of that file before trying another file. 1000a different representation of the file by adding non-empty suffixes to
1001It does so by adding the non-empty suffixes in `load-file-rep-suffixes' 1001its name, before trying another file. Emacs uses this feature to find
1002to the file name. Emacs uses this feature mainly to find compressed 1002compressed versions of files when Auto Compression mode is enabled.
1003versions of files when Auto Compression mode is enabled. 1003If NOSUFFIX is non-nil, disable this feature.
1004 1004
1005The exact suffixes that this function tries out, in the exact order, 1005The suffixes that this function tries out, when NOSUFFIX is nil, are
1006are given by the value of the variable `load-file-rep-suffixes' if 1006given by the return value of `get-load-suffixes' and the values listed
1007NOSUFFIX is non-nil and by the return value of the function 1007in `load-file-rep-suffixes'. If MUST-SUFFIX is non-nil, only the
1008`get-load-suffixes' if MUST-SUFFIX is non-nil. If both NOSUFFIX and 1008return value of `get-load-suffixes' is used, i.e. the file name is
1009MUST-SUFFIX are nil, this function first tries out the latter suffixes 1009required to have a non-empty suffix.
1010and then the former.
1011 1010
1012Loading a file records its definitions, and its `provide' and 1011Loading a file records its definitions, and its `provide' and
1013`require' calls, in an element of `load-history' whose 1012`require' calls, in an element of `load-history' whose