From 16eea16bc64a601f1d0bcda8c961873355279d38 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Fri, 7 Jan 2011 18:49:27 -0800
Subject: [PATCH] -batch implies -q.

* etc/PROBLEMS: -batch implies -q.

* msdos/sedleim.inp (RUN-EMACS): -batch imples --no-init-file.
---
 etc/ChangeLog     | 4 ++++
 etc/PROBLEMS      | 6 ++----
 msdos/ChangeLog   | 9 +++++----
 msdos/sedleim.inp | 4 ++--
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/etc/ChangeLog b/etc/ChangeLog
index fd414b0f3e8..22c674275c8 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-08  Glenn Morris  <rgm@gnu.org>
+
+	* PROBLEMS: -batch implies -q.
+
 2011-01-07  Tassilo Horn  <tassilo@member.fsf.org>
 
 	* themes/tsdh-light-theme.el, themes/tsdh-dark-theme.el: Remove
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 7090b225d7e..3766250b782 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -1,7 +1,7 @@
 Known Problems with GNU Emacs
 
 Copyright (C) 1987, 1988, 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-  2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+  2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
   Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
@@ -102,7 +102,7 @@ This can be another symptom of stale *.elc files in your load-path.
 The following command will print any duplicate Lisp files that are
 present in load-path:
 
-    emacs -q -batch -f list-load-path-shadows
+    emacs -batch -f list-load-path-shadows
 
 If this command prints any file names, some of these files are stale,
 and should be deleted or their directories removed from your
@@ -3244,5 +3244,3 @@ Local variables:
 mode: outline
 paragraph-separate: "[  ]*$"
 end:
-
-arch-tag: 49fc0d95-88cb-4715-b21c-f27fb5a4764a
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index c649e736219..7564e5b51b4 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-08  Glenn Morris  <rgm@gnu.org>
+
+	* sedleim.inp (RUN-EMACS): -batch implies --no-init-file.
+
 2011-01-07  Eli Zaretskii  <eliz@gnu.org>
 
 	* sed2v2.inp (HAVE___BUILTIN_UNWIND_INIT): Define.
@@ -1084,11 +1088,10 @@
 
 ;; Local Variables:
 ;; coding: utf-8
-;; add-log-time-zone-rule: t
 ;; End:
 
     Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
-       2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+       2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -1104,5 +1107,3 @@
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; arch-tag: b602fbb5-3776-4053-8de2-03da33c29d44
diff --git a/msdos/sedleim.inp b/msdos/sedleim.inp
index b5193e665a7..4d81b504ce4 100644
--- a/msdos/sedleim.inp
+++ b/msdos/sedleim.inp
@@ -3,7 +3,7 @@
 # ----------------------------------------------------------------------
 #
 # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-#   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+#   2005, 2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -34,7 +34,7 @@ s|\([ 	]\)echo|\1djecho|g
 
 /RUN-EMACS *=/,/^$/c\
 export EMACSLOADPATH=${buildlisppath}\
-RUN-EMACS = ${BUILT-EMACS} -batch --no-init-file --no-site-file
+RUN-EMACS = ${BUILT-EMACS} -batch --no-site-file
 
 /^	cd ../c\
 	${MAKE} -C ../src ${MFLAGS} emacs
-- 
2.11.4.GIT