[Emacs-diffs] /srv/bzr/emacs/trunk r102784: In Makefiles, -batch implies -q.

[Glenn Morris]

------------------------------------------------------------
revno: 102784
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2011-01-07 18:41:14 -0800
message:
  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.
modified:
  leim/ChangeLog
  leim/Makefile.in
  leim/makefile.w32-in
  lisp/ChangeLog
  lisp/makefile.w32-in
  src/ChangeLog
  src/Makefile.in
  src/makefile.w32-in

=== modified file 'leim/ChangeLog'
--- a/leim/ChangeLog    2010-09-01 07:13:21 +0000
+++ b/leim/ChangeLog    2011-01-08 02:41:14 +0000
@@ -1,3 +1,8 @@
+2011-01-08  Glenn Morris  <address@hidden>
+
+       * makefile.w32-in (RUN_EMACS):
+       * Makefile.in (RUN-EMACS): -batch implies --no-init-file.
+
 2010-08-28  Kenichi Handa  <address@hidden>
 
        * quail/japanese.el (quail-japanese-update-translation): Fix

=== modified file 'leim/Makefile.in'
--- a/leim/Makefile.in  2010-08-22 21:15:20 +0000
+++ b/leim/Makefile.in  2011-01-08 02:41:14 +0000
@@ -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 @@
 
 # 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.

=== modified file 'leim/makefile.w32-in'
--- a/leim/makefile.w32-in      2010-08-22 21:15:20 +0000
+++ b/leim/makefile.w32-in      2011-01-08 02:41:14 +0000
@@ -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 @@
 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)

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-07 19:07:29 +0000
+++ b/lisp/ChangeLog    2011-01-08 02:41:14 +0000
@@ -1,3 +1,7 @@
+2011-01-08  Glenn Morris  <address@hidden>
+
+       * makefile.w32-in (EMACSOPT): -batch implies --no-init-file.
+
 2011-01-07  Sam Steingold  <address@hidden>
 
        * w32-fns.el (w32-shell-name): Use `shell-file-name' instead of

=== modified file 'lisp/makefile.w32-in'
--- a/lisp/makefile.w32-in      2010-10-01 11:45:16 +0000
+++ b/lisp/makefile.w32-in      2011-01-08 02:41:14 +0000
@@ -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 @@
 
 # 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 =

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-01-08 02:31:57 +0000
+++ b/src/ChangeLog     2011-01-08 02:41:14 +0000
@@ -1,5 +1,8 @@
 2011-01-08  Glenn Morris  <address@hidden>
 
+       * 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.
 

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-12-04 19:50:39 +0000
+++ b/src/Makefile.in   2011-01-08 02:41:14 +0000
@@ -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 @@
 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

=== modified file 'src/makefile.w32-in'
--- a/src/makefile.w32-in       2010-10-13 23:08:58 +0000
+++ b/src/makefile.w32-in       2011-01-08 02:41:14 +0000
@@ -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 @@
 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