@c This is part of the Emacs manual.
-@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
-@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2011
+@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Emacs Invocation, X Resources, GNU Free Documentation License, Top
@appendix Command Line Arguments for Emacs Invocation
@item --no-site-file
@opindex --no-site-file
@cindex @file{site-start.el} file, not loading
-Do not load @file{site-start.el}. The options @samp{-q}, @samp{-u}
-and @samp{--batch} have no effect on the loading of this file---this
-option and @samp{-Q} are the only options that block it.
+Do not load @file{site-start.el} (@pxref{Init File}). The @samp{-Q}
+option does this too, but other options like @samp{-q} do not.
+
+@item --no-site-lisp
+@opindex --no-site-lisp
+@cindex @file{site-start.el} file, not loading
+Do not include the @file{site-lisp} directories in @code{load-path}
+(@pxref{Init File}). The @samp{-Q} option does this too.
@item --no-splash
@opindex --no-splash
@itemx --quick
@opindex --quick
Start emacs with minimum customizations, similar to using @samp{-q},
-@samp{--no-site-file}, and @samp{--no-splash} together. This also
-stops Emacs from processing X resources by setting
-@code{inhibit-x-resources} to @code{t} (@pxref{Resources}).
+@samp{--no-site-file}, @samp{--no-site-lisp}, and @samp{--no-splash}
+together. This also stops Emacs from processing X resources by
+setting @code{inhibit-x-resources} to @code{t} (@pxref{Resources}).
@item -daemon
@opindex -daemon
@vindex initial-environment
Inside Emacs, the command @kbd{M-x getenv} gets the value of an
environment variable. @kbd{M-x setenv} sets a variable in the Emacs
-environment. (Environment variable substitutions with @samp{$} work
-in the value just as in file names; see @ref{File Names with $}.) The
-variable @code{initial-environment} stores the initial environment
-inherited by Emacs.
+environment, and @kbd{C-u M-x setenv} removes a variable.
+(Environment variable substitutions with @samp{$} work in the value
+just as in file names; see @ref{File Names with $}.) The variable
+@code{initial-environment} stores the initial environment inherited by
+Emacs.
The way to set environment variables outside of Emacs depends on the
operating system, and especially the shell that you are using. For
Directory for the architecture-independent files that come with Emacs.
This is used to initialize the Lisp variable @code{data-directory}.
@item EMACSDOC
-Directory for the documentation string file,
-@file{DOC-@var{emacsversion}}. This is used to initialize the Lisp
-variable @code{doc-directory}.
+Directory for the documentation string file, which is used to
+initialize the Lisp variable @code{doc-directory}.
@item EMACSLOADPATH
A colon-separated list of directories@footnote{
Here and below, whenever we say ``colon-separated list of directories,''
to another system because the files you want to edit are there, or
because the Emacs executable file you want to run is there.
- The syntax of the @env{DISPLAY} environment variable is
+ @env{DISPLAY} has the syntax
@samp{@var{host}:@var{display}.@var{screen}}, where @var{host} is the
host name of the X Window System server machine, @var{display} is an
-arbitrarily-assigned number that distinguishes your server (X terminal)
-from other servers on the same machine, and @var{screen} is a
-rarely-used field that allows an X server to control multiple terminal
-screens. The period and the @var{screen} field are optional. If
-included, @var{screen} is usually zero.
+arbitrarily-assigned number that distinguishes your server (X
+terminal) from other servers on the same machine, and @var{screen} is
+a rarely-used field that allows an X server to control multiple
+terminal screens. The period and the @var{screen} field are optional.
+If included, @var{screen} is usually zero.
For example, if your host is named @samp{glasperle} and your server is
the first (or perhaps the only) server listed in the configuration, your
@c Enable horizontal scroll bars. Since horizontal scroll bars
@c are not yet implemented, this actually does nothing.
+@item --parent-id @var{ID}
+Open Emacs as a client X window via the XEmbed protocol, with @var{ID}
+as the parent X window id. Currently, this option is mainly useful
+for developers.
+
@item -vb
@opindex -vb
@itemx --vertical-scroll-bars
The @samp{--xrm} option (@pxref{Resources}) specifies additional
X resource values.
-
-@ignore
- arch-tag: fffecd9e-7329-4a51-a3cc-dd4a9889340e
-@end ignore