aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLute Kamstra2005-01-27 08:58:52 +0000
committerLute Kamstra2005-01-27 08:58:52 +0000
commit56366094d765e90c933bf6fc88e16bda25ebad87 (patch)
treec08e1fb01c705b4fad08825379c827feb8dd22e8
parent3bf93f74020a5df8e1449b7aecb130e667c78af7 (diff)
downloademacs-56366094d765e90c933bf6fc88e16bda25ebad87.tar.gz
emacs-56366094d765e90c933bf6fc88e16bda25ebad87.zip
(Initial Options): Add a cross reference to `Init File'. Mention the
`-Q' option at the `--no-site-file' option.
-rw-r--r--man/ChangeLog5
-rw-r--r--man/cmdargs.texi9
2 files changed, 10 insertions, 4 deletions
diff --git a/man/ChangeLog b/man/ChangeLog
index 63e3591265e..0e4f2a88bbf 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
12005-01-26 Lute Kamstra <lute@gnu.org>
2
3 * cmdargs.texi (Initial Options): Add a cross reference to `Init
4 File'. Mention the `-Q' option at the `--no-site-file' option.
5
12005-01-24 David Kastrup <dak@gnu.org> 62005-01-24 David Kastrup <dak@gnu.org>
2 7
3 * faq.texi: Update AUCTeX version info. 8 * faq.texi: Update AUCTeX version info.
diff --git a/man/cmdargs.texi b/man/cmdargs.texi
index b06aac4bdb6..960f2d0bd65 100644
--- a/man/cmdargs.texi
+++ b/man/cmdargs.texi
@@ -169,8 +169,9 @@ sections.
169 Some initial options affect the loading of init files. The normal 169 Some initial options affect the loading of init files. The normal
170actions of Emacs are to first load @file{site-start.el} if it exists, 170actions of Emacs are to first load @file{site-start.el} if it exists,
171then your own init file @file{~/.emacs} if it exists, and finally 171then your own init file @file{~/.emacs} if it exists, and finally
172@file{default.el} if it exists; certain options prevent loading of some 172@file{default.el} if it exists. @xref{Init File}. Certain options
173of these files or substitute other files for them. 173prevent loading of some of these files or substitute other files for
174them.
174 175
175@table @samp 176@table @samp
176@item -t @var{device} 177@item -t @var{device}
@@ -257,8 +258,8 @@ changed with the @kbd{M-x customize} command and its variants.
257@opindex --no-site-file 258@opindex --no-site-file
258@cindex @file{site-start.el} file, not loading 259@cindex @file{site-start.el} file, not loading
259Do not load @file{site-start.el}. The options @samp{-q}, @samp{-u} 260Do not load @file{site-start.el}. The options @samp{-q}, @samp{-u}
260and @samp{--batch} have no effect on the loading of this file---this is 261and @samp{--batch} have no effect on the loading of this file---this
261the only option that blocks it. 262option and @samp{-Q} are the only options that block it.
262 263
263@item -Q 264@item -Q
264@opindex -Q 265@opindex -Q