aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-01-07 18:49:27 -0800
committerGlenn Morris2011-01-07 18:49:27 -0800
commit16eea16bc64a601f1d0bcda8c961873355279d38 (patch)
tree803f008abfbd492ff770d870d8e1f1784307ac95
parentd0981f82865f355544d5f80ed819d408d12c3024 (diff)
downloademacs-16eea16bc64a601f1d0bcda8c961873355279d38.tar.gz
emacs-16eea16bc64a601f1d0bcda8c961873355279d38.zip
-batch implies -q.
* etc/PROBLEMS: -batch implies -q. * msdos/sedleim.inp (RUN-EMACS): -batch imples --no-init-file.
-rw-r--r--etc/ChangeLog4
-rw-r--r--etc/PROBLEMS6
-rw-r--r--msdos/ChangeLog9
-rw-r--r--msdos/sedleim.inp4
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 @@
12011-01-08 Glenn Morris <rgm@gnu.org>
2
3 * PROBLEMS: -batch implies -q.
4
12011-01-07 Tassilo Horn <tassilo@member.fsf.org> 52011-01-07 Tassilo Horn <tassilo@member.fsf.org>
2 6
3 * themes/tsdh-light-theme.el, themes/tsdh-dark-theme.el: Remove 7 * 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 @@
1Known Problems with GNU Emacs 1Known Problems with GNU Emacs
2 2
3Copyright (C) 1987, 1988, 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 3Copyright (C) 1987, 1988, 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 4 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
5 Free Software Foundation, Inc. 5 Free Software Foundation, Inc.
6See the end of the file for license conditions. 6See the end of the file for license conditions.
7 7
@@ -102,7 +102,7 @@ This can be another symptom of stale *.elc files in your load-path.
102The following command will print any duplicate Lisp files that are 102The following command will print any duplicate Lisp files that are
103present in load-path: 103present in load-path:
104 104
105 emacs -q -batch -f list-load-path-shadows 105 emacs -batch -f list-load-path-shadows
106 106
107If this command prints any file names, some of these files are stale, 107If this command prints any file names, some of these files are stale,
108and should be deleted or their directories removed from your 108and should be deleted or their directories removed from your
@@ -3244,5 +3244,3 @@ Local variables:
3244mode: outline 3244mode: outline
3245paragraph-separate: "[ ]*$" 3245paragraph-separate: "[ ]*$"
3246end: 3246end:
3247
3248arch-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 @@
12011-01-08 Glenn Morris <rgm@gnu.org>
2
3 * sedleim.inp (RUN-EMACS): -batch implies --no-init-file.
4
12011-01-07 Eli Zaretskii <eliz@gnu.org> 52011-01-07 Eli Zaretskii <eliz@gnu.org>
2 6
3 * sed2v2.inp (HAVE___BUILTIN_UNWIND_INIT): Define. 7 * sed2v2.inp (HAVE___BUILTIN_UNWIND_INIT): Define.
@@ -1084,11 +1088,10 @@
1084 1088
1085;; Local Variables: 1089;; Local Variables:
1086;; coding: utf-8 1090;; coding: utf-8
1087;; add-log-time-zone-rule: t
1088;; End: 1091;; End:
1089 1092
1090 Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 1093 Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
1091 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 1094 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
1092 1095
1093 This file is part of GNU Emacs. 1096 This file is part of GNU Emacs.
1094 1097
@@ -1104,5 +1107,3 @@
1104 1107
1105 You should have received a copy of the GNU General Public License 1108 You should have received a copy of the GNU General Public License
1106 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 1109 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
1107
1108;;; 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 @@
3# ---------------------------------------------------------------------- 3# ----------------------------------------------------------------------
4# 4#
5# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 5# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
6# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 6# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
7# 7#
8# This file is part of GNU Emacs. 8# This file is part of GNU Emacs.
9# 9#
@@ -34,7 +34,7 @@ s|\([ ]\)echo|\1djecho|g
34 34
35/RUN-EMACS *=/,/^$/c\ 35/RUN-EMACS *=/,/^$/c\
36export EMACSLOADPATH=${buildlisppath}\ 36export EMACSLOADPATH=${buildlisppath}\
37RUN-EMACS = ${BUILT-EMACS} -batch --no-init-file --no-site-file 37RUN-EMACS = ${BUILT-EMACS} -batch --no-site-file
38 38
39/^ cd ../c\ 39/^ cd ../c\
40 ${MAKE} -C ../src ${MFLAGS} emacs 40 ${MAKE} -C ../src ${MFLAGS} emacs