* src/lread.c (init_lread): Fix 2013-11-23 goof that was checking

uninstalled dump_path against installed Vload_path.

Fixes: debbugs:15964

diff --git a/src/ChangeLog b/src/ChangeLog
index 0818cb01156822ef0bc90327b3932f027b8f961c..a0b0bb2b2a87667b812a07862c2fb11a34a3f361 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-25  Glenn Morris  <rgm@gnu.org>
+
+       * lread.c (init_lread): Fix 2013-11-23 goof that was checking
+       uninstalled dump_path against installed Vload_path.  (Bug#15964)
+
 2013-11-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        Export get_pos_property to Elisp.

diff --git a/src/lread.c b/src/lread.c
index eaf1f818c43998d2e811808c6224ee9bb1a2b9c5..1f49be6e3617d25265d1482575e6b34995f08359 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -4374,6 +4374,7 @@ init_lread (void)
     }
   else                          /* Vpurify_flag || !EMACSLOADPATH */
     {
+      Lisp_Object lpath = Vload_path;
       Vload_path = load_path_default (0);
 
       /* Check before adding site-lisp directories.
@@ -4386,8 +4387,7 @@ init_lread (void)
          load-path has somehow already been changed (this can only be
          from a site-load file during dumping?) from the dumped value.
          FIXME?  Should we ignore any dump_path changes?  */
-      if (initialized && !no_site_lisp &&
-          ! NILP (Fequal (dump_path, Vload_path)))
+      if (initialized && !no_site_lisp && !NILP (Fequal (dump_path, lpath)))
         {
           Lisp_Object sitelisp;
           sitelisp = decode_env_path (0, PATH_SITELOADSEARCH, 0);