In Makefiles, -batch implies -q.

* leim/makefile.w32-in (RUN_EMACS):
* leim/Makefile.in (RUN-EMACS): -batch implies --no-init-file.

* lisp/makefile.w32-in (EMACSOPT): -batch implies --no-init-file.

* src/makefile.w32-in ($(EMACS)):
* src/Makefile.in (emacs$(EXEEXT)): -batch implies -q.

diff --git a/leim/ChangeLog b/leim/ChangeLog
index 1233aaf3062f931cb797c75736ee20038fd3d232..489fc39e738140f547683bfec86d3aad49c09bd2 100644 (file)
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-08  Glenn Morris  <rgm@gnu.org>
+
+       * makefile.w32-in (RUN_EMACS):
+       * Makefile.in (RUN-EMACS): -batch implies --no-init-file.
+
 2010-08-28  Kenichi Handa  <handa@m17n.org>
 
        * quail/japanese.el (quail-japanese-update-translation): Fix

diff --git a/leim/Makefile.in b/leim/Makefile.in
index ba70319ca1e683a712b313c4e5c1dc902d11f731..955aeb984217e612def47624899aad1710e59bbb 100644 (file)
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -1,9 +1,9 @@
 # Makefile for leim subdirectory in GNU Emacs.
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-#   2006, 2007, 2008, 2009, 2010
+#   2006, 2007, 2008, 2009, 2010, 2011
 #   Free Software Foundation, Inc.
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-#   2006, 2007, 2008, 2009, 2010
+#   2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H14PRO021
 
@@ -48,7 +48,7 @@ buildlisppath=${srcdir}/../lisp
 
 # How to run Emacs.
 RUN-EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \
-       ${BUILT-EMACS} -batch --no-init-file --no-site-file
+       ${BUILT-EMACS} -batch --no-site-file
 
 # Subdirectories to be made if ${srcdir} is different from the current
 # directory.

diff --git a/leim/makefile.w32-in b/leim/makefile.w32-in
index f55fbbf816c70c754d7e8e040d81a123046eb5f6..3ab9a754930f03908c0a246ae16941ba7bcd0d9f 100644 (file)
--- a/leim/makefile.w32-in
+++ b/leim/makefile.w32-in
@@ -1,5 +1,5 @@
 # -*- Makefile -*- for leim subdirectory in GNU Emacs on the Microsoft W32 API.
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   Free Software Foundation, Inc.
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 #   2006, 2007
@@ -37,7 +37,7 @@ BUILT_EMACS = $(THISDIR)/$(dot)$(dot)/src/$(BLD)/emacs.exe
 buildlisppath=$(CURDIR)/$(dot)$(dot)/lisp
 
 # How to run Emacs.
-RUN_EMACS = "$(BUILT_EMACS)" -batch --no-init-file --no-site-file
+RUN_EMACS = "$(BUILT_EMACS)" -batch --no-site-file
 
 # Set EMACSLOADPATH correctly (already defined in environment).
 EMACSLOADPATH=$(buildlisppath)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a40900bd5a4247aee99479bfa78decc7e2cac774..5a3d62401262469b0b50784b2e0e354f1c943473 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-08  Glenn Morris  <rgm@gnu.org>
+
+       * makefile.w32-in (EMACSOPT): -batch implies --no-init-file.
+
 2011-01-07  Sam Steingold  <sds@gnu.org>
 
        * w32-fns.el (w32-shell-name): Use `shell-file-name' instead of

diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index cd76ffa290a3752967ee2aa2d36b6215582c2f95..0b43f8dd14e135aa9d82ca3fb1ed1883efefee04 100644 (file)
--- a/lisp/makefile.w32-in
+++ b/lisp/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.
+#   2009, 2010, 2011  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -34,7 +34,7 @@ EMACS = $(THISDIR)/../bin/emacs.exe
 
 # Command line flags for Emacs.
 
-EMACSOPT = -batch --no-init-file --no-site-file
+EMACSOPT = -batch --no-site-file
 
 # Extra flags to pass to the byte compiler
 BYTE_COMPILE_EXTRA_FLAGS =

diff --git a/src/ChangeLog b/src/ChangeLog
index d8c0bee35776f24b65ae4d37afe9c2082d616403..1e38db4fd619022a2d0ad96edadc8fb4a71c4fb3 100644 (file)
--- 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 61b42f170304faeef5f5f99771369212d42e25df..0f85428b88ce1bd8d7522590d9b760cf8575b3b8 100644 (file)
--- 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 21bdeb8443f1f99679598d6b986fd211d1086e28..9d0f7df3bfbef315d59f2d9ff1ba13c05dbf56b7 100644 (file)
--- 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