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 /lisp | |
| parent | 4967fa34221e7028580c552d31d010b606b8c11b (diff) | |
| download | emacs-d0981f82865f355544d5f80ed819d408d12c3024.tar.gz | |
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 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/makefile.w32-in | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a40900bd5a4..5a3d6240126 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index cd76ffa290a..0b43f8dd14e 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in @@ -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 = |