diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-01-19 23:56:28 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-01-19 23:56:28 -0800 |
| commit | f952002e0ad535c15f70efd1011059e3fb97d50b (patch) | |
| tree | 8cb39fc844d7b81f9ba2858ced2e540cbfa984a3 /leim | |
| parent | 8251c3f8f5af438b1c8ef5b14a1080d610b71f65 (diff) | |
| download | emacs-f952002e0ad535c15f70efd1011059e3fb97d50b.tar.gz | |
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
Diffstat (limited to 'leim')
| -rw-r--r-- | leim/ChangeLog | 5 | ||||
| -rw-r--r-- | leim/Makefile.in | 4 |
2 files changed, 7 insertions, 2 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@ |