Commit 8fb8c4f3 authored by Paul Eggert's avatar Paul Eggert

Fix problems with CANNOT_DUMP and EMACSLOADPATH.

* leim/Makefile.in (RUN_EMACS):
* lisp/Makefile.in (emacs): Add lisp src to EMACSLOADPATH.
* lisp/loadup.el: Check for src/bootstrap-emacs only when Emacs can dump.
Expand dir too, in case it's relative.
* src/lread.c (init_lread): If CANNOT_DUMP, we can't be dumping.
parent 6c8e0ae6
2013-12-16 Paul Eggert <eggert@cs.ucla.edu>
Fix problems with CANNOT_DUMP and EMACSLOADPATH.
* Makefile.in (RUN_EMACS): Add lisp src to EMACSLOADPATH.
2013-11-28 Glenn Morris <rgm@gnu.org>
* Makefile.in (${leimdir}/leim-list.el):
......
......@@ -34,8 +34,8 @@ leimdir = ${srcdir}/../lisp/leim
EMACS = ../src/emacs
# How to run Emacs.
# Prevent any setting of EMACSLOADPATH in user environment causing problems.
RUN_EMACS = EMACSLOADPATH= "${EMACS}" -batch --no-site-file --no-site-lisp
RUN_EMACS = EMACSLOADPATH='$(srcdir)/../lisp' '$(EMACS)' \
-batch --no-site-file --no-site-lisp
MKDIR_P = @MKDIR_P@
......
2013-12-16 Paul Eggert <eggert@cs.ucla.edu>
Fix problems with CANNOT_DUMP and EMACSLOADPATH.
* Makefile.in (emacs): Add lisp src to EMACSLOADPATH.
* loadup.el: Check for src/bootstrap-emacs only when Emacs can dump.
Expand dir too, in case it's relative.
2013-12-16 Juri Linkov <juri@jurta.org>
* desktop.el (desktop-auto-save-timeout): Change default to
......
......@@ -105,8 +105,7 @@ COMPILE_FIRST = \
$(lisp)/emacs-lisp/autoload.elc
# The actual Emacs command run in the targets below.
# Prevent any setting of EMACSLOADPATH in user environment causing problems.
emacs = EMACSLOADPATH= "$(EMACS)" $(EMACSOPT)
emacs = EMACSLOADPATH='$(lisp)' '$(EMACS)' $(EMACSOPT)
# Common command to find subdirectories
setwins=for file in `find . -type d -print`; do \
......
......@@ -51,12 +51,13 @@
;; FIXME this is irritatingly fragile.
(equal (nth 4 command-line-args) "unidata-gen.el")
(equal (nth 7 command-line-args) "unidata-gen-files")
;; In case CANNOT_DUMP.
(string-match "src/bootstrap-emacs" (nth 0 command-line-args)))
(if (fboundp 'dump-emacs)
(string-match "src/bootstrap-emacs" (nth 0 command-line-args))
t))
(let ((dir (car load-path)))
;; We'll probably overflow the pure space.
(setq purify-flag nil)
(setq load-path (list dir
(setq load-path (list (expand-file-name "." dir)
(expand-file-name "emacs-lisp" dir)
(expand-file-name "language" dir)
(expand-file-name "international" dir)
......
2013-12-16 Paul Eggert <eggert@cs.ucla.edu>
Fix problems with CANNOT_DUMP and EMACSLOADPATH.
* lread.c (init_lread): If CANNOT_DUMP, we can't be dumping.
2013-12-16 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (Fmove_point_visually): Fix subtle bugs in the fallback
......
......@@ -4293,8 +4293,14 @@ init_lread (void)
{
/* First, set Vload_path. */
/* We explicitly ignore EMACSLOADPATH when dumping. */
if (NILP (Vpurify_flag) && egetenv ("EMACSLOADPATH"))
/* Ignore EMACSLOADPATH when dumping. */
#ifdef CANNOT_DUMP
bool use_loadpath = true;
#else
bool use_loadpath = !NILP (Vpurify_flag);
#endif
if (use_loadpath && egetenv ("EMACSLOADPATH"))
{
Vload_path = decode_env_path ("EMACSLOADPATH", 0, 1);
......
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