Commit f952002e authored by Paul Eggert's avatar Paul Eggert
Browse files

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
parent 8251c3f8
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> 2013-12-27 Paul Eggert <eggert@cs.ucla.edu>
Sync better from sources. Sync better from sources.
......
...@@ -34,8 +34,8 @@ leimdir = ${srcdir}/../lisp/leim ...@@ -34,8 +34,8 @@ leimdir = ${srcdir}/../lisp/leim
EMACS = ../src/emacs EMACS = ../src/emacs
# How to run Emacs. # How to run Emacs.
RUN_EMACS = EMACSLOADPATH='$(srcdir)/../lisp' '$(EMACS)' \ # Prevent any setting of EMACSLOADPATH in user environment causing problems.
-batch --no-site-file --no-site-lisp RUN_EMACS = EMACSLOADPATH= '$(EMACS)' -batch --no-site-file --no-site-lisp
MKDIR_P = @MKDIR_P@ MKDIR_P = @MKDIR_P@
......
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> 2014-01-19 Michael Albinus <michael.albinus@gmx.de>
* eshell/esh-mode.el (eshell-password-prompt-regexp): * eshell/esh-mode.el (eshell-password-prompt-regexp):
......
...@@ -89,7 +89,8 @@ BIG_STACK_DEPTH = 2200 ...@@ -89,7 +89,8 @@ BIG_STACK_DEPTH = 2200
BIG_STACK_OPTS = --eval "(setq max-lisp-eval-depth $(BIG_STACK_DEPTH))" BIG_STACK_OPTS = --eval "(setq max-lisp-eval-depth $(BIG_STACK_DEPTH))"
# Set load-prefer-newer for the benefit of the non-bootstrappers. # 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 # 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 # speed up the bootstrap process. They're ordered by size, so we use
...@@ -106,7 +107,8 @@ COMPILE_FIRST = \ ...@@ -106,7 +107,8 @@ COMPILE_FIRST = \
$(lisp)/emacs-lisp/autoload.elc $(lisp)/emacs-lisp/autoload.elc
# The actual Emacs command run in the targets below. # 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 # Common command to find subdirectories
setwins=for file in `find . -type d -print`; do \ setwins=for file in `find . -type d -print`; do \
......
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> 2014-01-19 Eli Zaretskii <eliz@gnu.org>
* w32font.c (w32_load_unicows_or_gdi32, get_outline_metrics_w) * w32font.c (w32_load_unicows_or_gdi32, get_outline_metrics_w)
......
...@@ -4345,7 +4345,7 @@ init_lread (void) ...@@ -4345,7 +4345,7 @@ init_lread (void)
#ifdef CANNOT_DUMP #ifdef CANNOT_DUMP
bool use_loadpath = true; bool use_loadpath = true;
#else #else
bool use_loadpath = !NILP (Vpurify_flag); bool use_loadpath = NILP (Vpurify_flag);
#endif #endif
if (use_loadpath && egetenv ("EMACSLOADPATH")) if (use_loadpath && egetenv ("EMACSLOADPATH"))
...@@ -4388,7 +4388,7 @@ init_lread (void) ...@@ -4388,7 +4388,7 @@ init_lread (void)
} }
} /* Fmemq (Qnil, Vload_path) */ } /* Fmemq (Qnil, Vload_path) */
} }
else /* Vpurify_flag || !EMACSLOADPATH */ else
{ {
Vload_path = load_path_default (); Vload_path = load_path_default ();
...@@ -4405,7 +4405,7 @@ init_lread (void) ...@@ -4405,7 +4405,7 @@ init_lread (void)
sitelisp = decode_env_path (0, PATH_SITELOADSEARCH, 0); sitelisp = decode_env_path (0, PATH_SITELOADSEARCH, 0);
if (! NILP (sitelisp)) Vload_path = nconc2 (sitelisp, Vload_path); if (! NILP (sitelisp)) Vload_path = nconc2 (sitelisp, Vload_path);
} }
} /* !Vpurify_flag && EMACSLOADPATH */ }
Vvalues = Qnil; Vvalues = Qnil;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment