diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/Makefile.in | 6 | ||||
| -rw-r--r-- | src/makefile.w32-in | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d8c0bee3577..1e38db4fd61 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2011-01-08 Glenn Morris <rgm@gnu.org> + * makefile.w32-in ($(EMACS)): + * Makefile.in (emacs$(EXEEXT)): -batch implies -q. + * xdisp.c (syms_of_xdisp) <Qrisky_local_variable>: Move from here... * emacs.c (syms_of_emacs) <Qrisky_local_variable>: ...to here. diff --git a/src/Makefile.in b/src/Makefile.in index 61b42f17030..0f85428b88c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,7 +1,7 @@ # src/Makefile for GNU Emacs. # Copyright (C) 1985, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -612,12 +612,12 @@ all: emacs$(EXEEXT) $(OTHER_FILES) emacs$(EXEEXT): temacs$(EXEEXT) $(etc)/DOC $(lisp) if test "$(CANNOT_DUMP)" = "yes"; then \ ln -f temacs$(EXEEXT) emacs$(EXEEXT); \ - EMACSLOADPATH=$(lispsource) ./emacs -q -batch \ + EMACSLOADPATH=$(lispsource) ./emacs -batch \ -f list-load-path-shadows || true; \ else \ LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump || exit 1; \ ln -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \ - ./emacs -q -batch -f list-load-path-shadows || true; \ + ./emacs -batch -f list-load-path-shadows || true; \ fi ## We run make-docfile twice because the command line may get too long diff --git a/src/makefile.w32-in b/src/makefile.w32-in index 21bdeb8443f..9d0f7df3bfb 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in @@ -1,6 +1,6 @@ # -*- Makefile -*- for GNU Emacs on the Microsoft W32 API. # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -# 2008, 2009, 2010 Free Software Foundation, Inc. +# 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -165,7 +165,7 @@ all: $(ALL) emacs: stamp_BLD $(EMACS) $(EMACS): $(DOC) $(TEMACS) "$(THISDIR)/$(BLD)/temacs.exe" -batch -l loadup dump - -"$(THISDIR)/$(BLD)/emacs.exe" -q -batch -f list-load-path-shadows + -"$(THISDIR)/$(BLD)/emacs.exe" -batch -f list-load-path-shadows # # The undumped executable |