aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/fns.c3
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4ea54141142..18ecc1ae41f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12011-07-04 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * fns.c (Frequire): Remove the mention of the .gz files, since
4 that's installation-specific, but keep the mention of
5 `get-load-suffixes'.
6
12011-07-04 Paul Eggert <eggert@cs.ucla.edu> 72011-07-04 Paul Eggert <eggert@cs.ucla.edu>
2 8
3 * editfns.c (Fformat_time_string): Don't assume strlen fits in int. 9 * editfns.c (Fformat_time_string): Don't assume strlen fits in int.
diff --git a/src/fns.c b/src/fns.c
index 8cccd7485da..5d2524d5cc2 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -2613,8 +2613,7 @@ is not loaded; so load the file FILENAME.
2613If FILENAME is omitted, the printname of FEATURE is used as the file name, 2613If FILENAME is omitted, the printname of FEATURE is used as the file name,
2614and `load' will try to load this name appended with the suffix `.elc' or 2614and `load' will try to load this name appended with the suffix `.elc' or
2615`.el', in that order. The name without appended suffix will not be used. 2615`.el', in that order. The name without appended suffix will not be used.
2616If your system supports it, `.elc.gz' and `.el.gz' files will also be 2616See `get-load-suffixes' for the complete list of suffixes.
2617considered. See `get-load-suffixes' for the complete list of suffixes.
2618If the optional third argument NOERROR is non-nil, 2617If the optional third argument NOERROR is non-nil,
2619then return nil if the file is not found instead of signaling an error. 2618then return nil if the file is not found instead of signaling an error.
2620Normally the return value is FEATURE. 2619Normally the return value is FEATURE.