Revert some of the CANNOT_DUMP fix.

Because of this, "make bootstrap" won't work if CANNOT_DUMP=yes,
but fixing this can wait until after the next release.
* leim/Makefile.in (RUN_EMACS): Keep EMACSLOADPATH empty.
* lisp/Makefile.in (emacs): Keep EMACSLOADPATH empty.
* src/lread.c (init_lread): Fix typo: NILP, not !NILP.

Fixes: debbugs:16494

2 files changed, 8 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f20b832ed40..87b84e00918 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Revert some of the CANNOT_DUMP fix (Bug#16494).
+        * lread.c (init_lread): Fix typo: NILP, not !NILP.
+
 2014-01-19  Eli Zaretskii  <eliz@gnu.org>
 
         * w32font.c (w32_load_unicows_or_gdi32, get_outline_metrics_w)
diff --git a/src/lread.c b/src/lread.c
index dcc883b2445..d6118d0a4e3 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -4345,7 +4345,7 @@ init_lread (void)
 #ifdef CANNOT_DUMP
   bool use_loadpath = true;
 #else
-  bool use_loadpath = !NILP (Vpurify_flag);
+  bool use_loadpath = NILP (Vpurify_flag);
 #endif
 
   if (use_loadpath && egetenv ("EMACSLOADPATH"))
@@ -4388,7 +4388,7 @@ init_lread (void)
             }
         }                       /* Fmemq (Qnil, Vload_path) */
     }
-  else                          /* Vpurify_flag || !EMACSLOADPATH */
+  else
     {
       Vload_path = load_path_default ();
 
@@ -4405,7 +4405,7 @@ init_lread (void)
           sitelisp = decode_env_path (0, PATH_SITELOADSEARCH, 0);
           if (! NILP (sitelisp)) Vload_path = nconc2 (sitelisp, Vload_path);
         }
-    }                           /* !Vpurify_flag && EMACSLOADPATH */
+    }
 
   Vvalues = Qnil;