Fix use of "-l" on command line after installation.

The use of "-l" shouldn't override the loading of dumped.elc for
users.  When we need to suppress the use of dumped.elc in the build
process, do so explicitly.

* src/emacs.c (main): Let the loading of dumped.elc override the
loading of a module specified with "-l".
* src/Makefile.in (emacs$(EXEEXT)): Pass --no-loadup when running
temacs.
(bootstrap-emacs$(EXEEXT)): Likewise.

diff --git a/src/Makefile.in b/src/Makefile.in
index e2f70e6a9f6aaed3214ac74802596cbcb2d0157c..ca250885033733c2d5a70d0ac0a3306c0795ccec 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -529,7 +529,7 @@ ${lispintdir}/characters.elc: ${charscript:.el=.elc}
 emacs$(EXEEXT): temacs$(EXEEXT) \
                 lisp.mk $(etc)/DOC $(lisp) \
                 $(lispsource)/international/charprop.el ${charsets}
-       LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump
+       LC_ALL=C $(RUN_TEMACS) --no-loadup -batch $(BUILD_DETAILS) -l loadup dump
 ifeq ($(CANNOT_DUMP),yes)
        ln -f temacs$(EXEEXT) $@
 else
@@ -733,7 +733,7 @@ $(lispsource)/loaddefs.el: $(VCSWITNESS) | bootstrap-emacs$(EXEEXT)
 ## files from loadup.el in source form.
 bootstrap-emacs$(EXEEXT): temacs$(EXEEXT)
        $(MAKE) -C ../lisp update-subdirs
-       $(RUN_TEMACS) --batch $(BUILD_DETAILS) --load loadup bootstrap
+       $(RUN_TEMACS) --no-loadup --batch $(BUILD_DETAILS) --load loadup bootstrap
 ifeq ($(CANNOT_DUMP),yes)
        ln -f temacs$(EXEEXT) $@
 else

diff --git a/src/emacs.c b/src/emacs.c
index 832fc2c13ed1d73ef517a94c3d04b97cfdca51bc..4e812b19a0f4e97ba20e72796e3f61161726d59e 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1670,7 +1670,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
 #endif
          Vtop_level = list2 (Qload, build_unibyte_string (file));
        }
-      else if (! no_loadup)
+      if (! no_loadup)
         /* Unless next switch is -nl, load "dumped.elc" first thing.
           If it fails, we won't be able to run.  */
        {