From: Glenn Morris <rgm@gnu.org>
Date: Sat, 8 Jan 2011 02:41:14 +0000 (-0800)
Subject: In Makefiles, -batch implies -q.
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~268
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d0981f82865f355544d5f80ed819d408d12c3024;p=emacs.git

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 1233aaf3062..489fc39e738 100644
--- 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 ba70319ca1e..955aeb98421 100644
--- 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 f55fbbf816c..3ab9a754930 100644
--- 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 a40900bd5a4..5a3d6240126 100644
--- 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 cd76ffa290a..0b43f8dd14e 100644
--- 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 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