From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sat, 23 Nov 2013 03:23:20 +0000 (-0500)
Subject: * src/lread.c (init_lread): Fix int/Lisp_Object mixup.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~732
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2c98e669efd79379579006f3aea918f5c75748c0;p=emacs.git

* src/lread.c (init_lread): Fix int/Lisp_Object mixup.
Please use --enable-check-lisp-object-type.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index bc3d3ba6f25..e9454a783e9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lread.c (init_lread): Fix int/Lisp_Object mixup.
+	Please use --enable-check-lisp-object-type.
+
 2013-11-23  Glenn Morris  <rgm@gnu.org>
 
 	* 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)
       load_path_check (Vload_path);
 
       /* Replace any nil elements from the environment with the default.  */
-      if (Fmemq (Qnil, Vload_path))
+      if (!NILP (Fmemq (Qnil, Vload_path)))
         {
           Lisp_Object lpath = Vload_path;
           Lisp_Object elem, default_lpath = load_path_default (1);