aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorXue Fuqiao2013-12-22 08:52:26 +0800
committerXue Fuqiao2013-12-22 08:52:26 +0800
commit2dc383bc06b279f246f0a6bdf239899082975383 (patch)
tree1ada12f3d242b1ab0488c403e43f8ef69dc0752b /src
parentb51ad4cf0a4ff7d2140197980ef93e098899a906 (diff)
downloademacs-2dc383bc06b279f246f0a6bdf239899082975383.tar.gz
emacs-2dc383bc06b279f246f0a6bdf239899082975383.zip
* src/lread.c (syms_of_lread) <load_prefer_newer>: Doc fix.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/lread.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e2c5cf20167..832caf42a06 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-12-22 Xue Fuqiao <xfq.free@gmail.com>
2
3 * lread.c (syms_of_lread) <load_prefer_newer>: Doc fix.
4
12013-12-21 Jan Djärv <jan.h.d@swipnet.se> 52013-12-21 Jan Djärv <jan.h.d@swipnet.se>
2 6
3 * nsterm.h: Declare EmacsColor category. 7 * nsterm.h: Declare EmacsColor category.
diff --git a/src/lread.c b/src/lread.c
index 6404b56fc11..1db3a47ef0a 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -4679,8 +4679,9 @@ variables, this must be set in the first line of a file. */);
4679This applies when a filename suffix is not explicitly specified and 4679This applies when a filename suffix is not explicitly specified and
4680`load' is trying various possible suffixes (see `load-suffixes' and 4680`load' is trying various possible suffixes (see `load-suffixes' and
4681`load-file-rep-suffixes'). Normally, it stops at the first file 4681`load-file-rep-suffixes'). Normally, it stops at the first file
4682that exists. If this option is non-nil, it checks all suffixes and 4682that exists unless you explicitly specify one or the other. If this
4683uses whichever file is newest. 4683option is non-nil, it checks all suffixes and uses whichever file is
4684newest.
4684Note that if you customize this, obviously it will not affect files 4685Note that if you customize this, obviously it will not affect files
4685that are loaded before your customizations are read! */); 4686that are loaded before your customizations are read! */);
4686 load_prefer_newer = 0; 4687 load_prefer_newer = 0;