aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2013-11-22 22:23:20 -0500
committerStefan Monnier2013-11-22 22:23:20 -0500
commit2c98e669efd79379579006f3aea918f5c75748c0 (patch)
treec67b5517f3c5a634a73ce09d9fcffe8b4e327c16 /src
parent09b0f3d9cf49919618513e5397a3183ea88235b0 (diff)
downloademacs-2c98e669efd79379579006f3aea918f5c75748c0.tar.gz
emacs-2c98e669efd79379579006f3aea918f5c75748c0.zip
* src/lread.c (init_lread): Fix int/Lisp_Object mixup.
Please use --enable-check-lisp-object-type.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/lread.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index bc3d3ba6f25..e9454a783e9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-11-23 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * lread.c (init_lread): Fix int/Lisp_Object mixup.
4 Please use --enable-check-lisp-object-type.
5
12013-11-23 Glenn Morris <rgm@gnu.org> 62013-11-23 Glenn Morris <rgm@gnu.org>
2 7
3 * process.c (get_process): Explicit error for dead buffers. 8 * process.c (get_process): Explicit error for dead buffers.
diff --git a/src/lread.c b/src/lread.c
index 17ca02d36c7..eaf1f818c43 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -4341,7 +4341,7 @@ init_lread (void)
4341 load_path_check (Vload_path); 4341 load_path_check (Vload_path);
4342 4342
4343 /* Replace any nil elements from the environment with the default. */ 4343 /* Replace any nil elements from the environment with the default. */
4344 if (Fmemq (Qnil, Vload_path)) 4344 if (!NILP (Fmemq (Qnil, Vload_path)))
4345 { 4345 {
4346 Lisp_Object lpath = Vload_path; 4346 Lisp_Object lpath = Vload_path;
4347 Lisp_Object elem, default_lpath = load_path_default (1); 4347 Lisp_Object elem, default_lpath = load_path_default (1);