[Emacs-diffs] trunk r116077: Revert some of the CANNOT_DUMP fix.

[Paul Eggert]

------------------------------------------------------------
revno: 116077
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16494
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2014-01-19 23:56:28 -0800
message:
  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.
modified:
  leim/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1629
  leim/Makefile.in               
makefile.in-20091113204419-o5vbwnq5f7feedwu-1200
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/Makefile.in               
makefile.in-20091113204419-o5vbwnq5f7feedwu-1831
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/lread.c                    lread.c-20091113204419-o5vbwnq5f7feedwu-266

=== modified file 'leim/ChangeLog'
--- a/leim/ChangeLog    2014-01-17 01:54:23 +0000
+++ b/leim/ChangeLog    2014-01-20 07:56:28 +0000
@@ -1,3 +1,8 @@
+2014-01-20  Paul Eggert  <address@hidden>
+
+       Revert some of the CANNOT_DUMP fix (Bug#16494).
+       * Makefile.in (RUN_EMACS): Keep EMACSLOADPATH empty.
+
 2013-12-27  Paul Eggert  <address@hidden>
 
        Sync better from sources.

=== modified file 'leim/Makefile.in'
--- a/leim/Makefile.in  2014-01-01 07:43:34 +0000
+++ b/leim/Makefile.in  2014-01-20 07:56:28 +0000
@@ -34,8 +34,8 @@
 EMACS = ../src/emacs
 
 # How to run Emacs.
-RUN_EMACS = EMACSLOADPATH='$(srcdir)/../lisp' '$(EMACS)' \
-  -batch --no-site-file --no-site-lisp
+# Prevent any setting of EMACSLOADPATH in user environment causing problems.
+RUN_EMACS = EMACSLOADPATH= '$(EMACS)' -batch --no-site-file --no-site-lisp
 
 MKDIR_P = @MKDIR_P@
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-01-19 13:23:18 +0000
+++ b/lisp/ChangeLog    2014-01-20 07:56:28 +0000
@@ -1,3 +1,10 @@
+2014-01-20  Paul Eggert  <address@hidden>
+
+       Revert some of the CANNOT_DUMP fix (Bug#16494).
+       Because of this, "make bootstrap" won't work if CANNOT_DUMP=yes,
+       but fixing this can wait until after the next release.
+       * Makefile.in (emacs): Keep EMACSLOADPATH empty.
+
 2014-01-19  Michael Albinus  <address@hidden>
 
        * eshell/esh-mode.el (eshell-password-prompt-regexp):

=== modified file 'lisp/Makefile.in'
--- a/lisp/Makefile.in  2014-01-01 07:43:34 +0000
+++ b/lisp/Makefile.in  2014-01-20 07:56:28 +0000
@@ -89,7 +89,8 @@
 BIG_STACK_OPTS = --eval "(setq max-lisp-eval-depth $(BIG_STACK_DEPTH))"
 
 # Set load-prefer-newer for the benefit of the non-bootstrappers.
-BYTE_COMPILE_FLAGS = $(BIG_STACK_OPTS) --eval '(setq load-prefer-newer t)' 
$(BYTE_COMPILE_EXTRA_FLAGS)
+BYTE_COMPILE_FLAGS = $(BIG_STACK_OPTS) \
+  --eval '(setq load-prefer-newer t)' $(BYTE_COMPILE_EXTRA_FLAGS)
 
 # Files to compile before others during a bootstrap.  This is done to
 # speed up the bootstrap process.  They're ordered by size, so we use
@@ -106,7 +107,8 @@
        $(lisp)/emacs-lisp/autoload.elc
 
 # The actual Emacs command run in the targets below.
-emacs = EMACSLOADPATH='$(lisp)' '$(EMACS)' $(EMACSOPT)
+# Prevent any setting of EMACSLOADPATH in user environment causing problems.
+emacs = EMACSLOADPATH= '$(EMACS)' $(EMACSOPT)
 
 # Common command to find subdirectories
 setwins=for file in `find . -type d -print`; do \

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-01-19 15:42:48 +0000
+++ b/src/ChangeLog     2014-01-20 07:56:28 +0000
@@ -1,3 +1,8 @@
+2014-01-20  Paul Eggert  <address@hidden>
+
+       Revert some of the CANNOT_DUMP fix (Bug#16494).
+       * lread.c (init_lread): Fix typo: NILP, not !NILP.
+
 2014-01-19  Eli Zaretskii  <address@hidden>
 
        * w32font.c (w32_load_unicows_or_gdi32, get_outline_metrics_w)

=== modified file 'src/lread.c'
--- a/src/lread.c       2014-01-03 06:47:27 +0000
+++ b/src/lread.c       2014-01-20 07:56:28 +0000
@@ -4345,7 +4345,7 @@
 #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 @@
             }
         }                       /* Fmemq (Qnil, Vload_path) */
     }
-  else                          /* Vpurify_flag || !EMACSLOADPATH */
+  else
     {
       Vload_path = load_path_default ();
 
@@ -4405,7 +4405,7 @@
           sitelisp = decode_env_path (0, PATH_SITELOADSEARCH, 0);
           if (! NILP (sitelisp)) Vload_path = nconc2 (sitelisp, Vload_path);
         }
-    }                           /* !Vpurify_flag && EMACSLOADPATH */
+    }
 
   Vvalues = Qnil;