[Emacs-diffs] trunk r115217: * src/lread.c (init_lread): Fix 2013-11-23 goof that was checking

[Glenn Morris]

------------------------------------------------------------
revno: 115217
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15964
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2013-11-24 17:35:45 -0800
message:
  * src/lread.c (init_lread): Fix 2013-11-23 goof that was checking
  uninstalled dump_path against installed Vload_path.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/lread.c                    lread.c-20091113204419-o5vbwnq5f7feedwu-266

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-11-24 18:28:33 +0000
+++ b/src/ChangeLog     2013-11-25 01:35:45 +0000
@@ -1,3 +1,8 @@
+2013-11-25  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        Export get_pos_property to Elisp.

=== modified file 'src/lread.c'
--- a/src/lread.c       2013-11-23 03:23:20 +0000
+++ b/src/lread.c       2013-11-25 01:35:45 +0000
@@ -4374,6 +4374,7 @@
     }
   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 @@
          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);