diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-01-07 18:41:14 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-01-07 18:41:14 -0800 |
| commit | d0981f82865f355544d5f80ed819d408d12c3024 (patch) | |
| tree | 7960e3277bb604d2bb3ed27665b7f1e2df990d96 /leim | |
| parent | 4967fa34221e7028580c552d31d010b606b8c11b (diff) | |
| download | emacs-d0981f82865f355544d5f80ed819d408d12c3024.tar.gz emacs-d0981f82865f355544d5f80ed819d408d12c3024.tar.bz2 emacs-d0981f82865f355544d5f80ed819d408d12c3024.zip | |
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.
Diffstat (limited to 'leim')
| -rw-r--r-- | leim/ChangeLog | 5 | ||||
| -rw-r--r-- | leim/Makefile.in | 6 | ||||
| -rw-r--r-- | leim/makefile.w32-in | 4 |
3 files changed, 10 insertions, 5 deletions
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) |