diff options
| -rw-r--r-- | leim/ChangeLog | 5 | ||||
| -rw-r--r-- | leim/Makefile.in | 4 | ||||
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/Makefile.in | 6 | ||||
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lread.c | 6 |
6 files changed, 26 insertions, 7 deletions
diff --git a/leim/ChangeLog b/leim/ChangeLog index 21f570b29c8..e45d632cedd 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,3 +1,8 @@ +2014-01-20 Paul Eggert <eggert@cs.ucla.edu> + + Revert some of the CANNOT_DUMP fix (Bug#16494). + * Makefile.in (RUN_EMACS): Keep EMACSLOADPATH empty. + 2013-12-27 Paul Eggert <eggert@cs.ucla.edu> Sync better from sources. diff --git a/leim/Makefile.in b/leim/Makefile.in index b1b36888360..6bfc3ae7048 100644 --- a/leim/Makefile.in +++ b/leim/Makefile.in @@ -34,8 +34,8 @@ leimdir = ${srcdir}/../lisp/leim 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@ diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cd7184c1b86..1c63cacf6ac 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2014-01-20 Paul Eggert <eggert@cs.ucla.edu> + + 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 <michael.albinus@gmx.de> * eshell/esh-mode.el (eshell-password-prompt-regexp): diff --git a/lisp/Makefile.in b/lisp/Makefile.in index c2c108334a8..ebd2432e10c 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -89,7 +89,8 @@ BIG_STACK_DEPTH = 2200 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 @@ COMPILE_FIRST = \ $(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 \ 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; |