procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

In Makefiles, -batch implies -q.

Browse source 
* 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.
This commit is contained in:
Glenn Morris 2011-01-07 18:41:14 -08:00
parent 4967fa3422
commit d0981f8286
8 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
leim/ChangeLog
View file

@ -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

6
leim/Makefile.in
View file

@ -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.

4
leim/makefile.w32-in
View file

@ -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)

4
lisp/ChangeLog
View file

@ -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

4
lisp/makefile.w32-in
View file

@ -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 =

3
src/ChangeLog
View file

@ -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.

6
src/Makefile.in
View file

@ -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

4
src/makefile.w32-in
View file

@ -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