Re: Proposal: emacs -Q option

[Juri Linkov <juri@jurta.org>]

Richard Stallman <rms@gnu.org> writes:
>     --help, --version, --no-shared-memory, -nl, --find-file, --directory,
>     -L DIR, and some display options are missed in the cmdargs.texi.
>
> Could you possibly write text to document them there?
>
>     --no-desktop is not documented in the cmdargs.texi and emacs.c.
>
> Could you add that?
>
>     --find-file and many display options are not documented in the startup.el.
>
>     Perhaps the documentation of command line arguments in the comments
>     section of the startup.el is redundant because it is not helpful for users.
>
> To save effort, we may as well get rid of that duplicate documentation.

emacs/man/ChangeLog:

2004-02-08  Juri Linkov  <juri@jurta.org>

	* cmdargs.texi (Action Arguments): Add alias --find-file.  Add
	--directory, --help, --version.  Move text about command-line-args
	to Command Arguments.
	(Initial Options): Remove alias -batch.  Add @cindex for --script.
	Fix @cindex for -q.  Add --no-desktop.  Add alias --no-multibyte,
	--no-unibyte.
	(Window Size X): Join -g and --geometry.  Add @cindex.
	(Borders X): Fix @cindex for -ib.  Add @cindex for -bw.
	(Title X): Remove alias -title.
	(Icons X): Remove alias -iconic.
	(Misc X): New node.

emacs/lisp/ChangeLog:

2004-02-08  Juri Linkov  <juri@jurta.org>

	* startup.el: Remove table of command line arguments from
	Commentary section.

emacs/src/ChangeLog:

2004-02-08  Juri Linkov  <juri@jurta.org>

	* emacs.c (USAGE1): Add --no-desktop.  Move --display from USAGE2.
	Fix --multibyte.  Move --help, --version to USAGE2.  Add alias
	--file.  Fix -f, -l.  Sort options.  Untabify.
	(USAGE2): Add -hb.  Fix --name, --title.  Sort options.  Untabify.

Index: emacs/man/cmdargs.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/man/cmdargs.texi,v
retrieving revision 1.76
diff -c -r1.76 cmdargs.texi
*** emacs/man/cmdargs.texi	2 Nov 2003 07:01:00 -0000	1.76
--- emacs/man/cmdargs.texi	8 Feb 2004 06:52:25 -0000
***************
*** 1,5 ****
  @c This is part of the Emacs manual.
! @c Copyright (C) 1985,86,87,93,94,95,1997,2001, 2003 Free Software Foundation, Inc.
  @c See file emacs.texi for copying conditions.
  @node Command Arguments, X Resources, Service, Top
  @appendix Command Line Arguments
--- 1,5 ----
  @c This is part of the Emacs manual.
! @c Copyright (C) 1985,86,87,93,94,95,97,2001,03,2004 Free Software Foundation, Inc.
  @c See file emacs.texi for copying conditions.
  @node Command Arguments, X Resources, Service, Top
  @appendix Command Line Arguments
***************
*** 46,72 ****
  
  @cindex initial options (command line)
  @cindex action options (command line)
    Most options specify how to initialize Emacs, or set parameters for
  the Emacs session.  We call them @dfn{initial options}.  A few options
  specify things to do: for example, load libraries, call functions, or
  terminate Emacs.  These are called @dfn{action options}.  These and file
  names together are called @dfn{action arguments}.  Emacs processes all
! the action arguments in the order they are written.
  
  @menu
! * Action Arguments::	Arguments to visit files, load libraries,
! 			  and call functions.
  * Initial Options::     Arguments that take effect while starting Emacs.
  * Command Example::     Examples of using command line arguments.
! * Resume Arguments::	Specifying arguments when you resume a running Emacs.
  * Environment::         Environment variables that Emacs uses.
  * Display X::           Changing the default display and using remote login.
! * Font X::	        Choosing a font for text, under X.
! * Colors::	        Choosing display colors.
  * Window Size X::       Start-up window size, under X.
! * Borders X::	        Internal and external borders, under X.
  * Title X::             Specifying the initial frame's title.
  * Icons X::             Choosing what sort of icon to use, under X.
  @end menu
  
  @node Action Arguments
--- 46,78 ----
  
  @cindex initial options (command line)
  @cindex action options (command line)
+ @vindex command-line-args
    Most options specify how to initialize Emacs, or set parameters for
  the Emacs session.  We call them @dfn{initial options}.  A few options
  specify things to do: for example, load libraries, call functions, or
  terminate Emacs.  These are called @dfn{action options}.  These and file
  names together are called @dfn{action arguments}.  Emacs processes all
! the action arguments in the order they are written.  The init file can
! access the values of the action arguments as the elements of a list in
! the variable @code{command-line-args}.  The init file can override the
! normal processing of the action arguments, or define new ones, by
! reading and setting this variable.
  
  @menu
! * Action Arguments::    Arguments to visit files, load libraries,
!                           and call functions.
  * Initial Options::     Arguments that take effect while starting Emacs.
  * Command Example::     Examples of using command line arguments.
! * Resume Arguments::    Specifying arguments when you resume a running Emacs.
  * Environment::         Environment variables that Emacs uses.
  * Display X::           Changing the default display and using remote login.
! * Font X::              Choosing a font for text, under X.
! * Colors::              Choosing display colors.
  * Window Size X::       Start-up window size, under X.
! * Borders X::           Internal and external borders, under X.
  * Title X::             Specifying the initial frame's title.
  * Icons X::             Choosing what sort of icon to use, under X.
+ * Misc X::              Other display options.
  @end menu
  
  @node Action Arguments
***************
*** 76,85 ****
  
  @table @samp
  @item @var{file}
- @opindex --visit
- @itemx --visit=@var{file}
  @opindex --file
  @itemx --file=@var{file}
  @cindex visiting files, command-line argument
  @vindex inhibit-startup-buffer-menu
  Visit @var{file} using @code{find-file}.  @xref{Visiting}.
--- 82,93 ----
  
  @table @samp
  @item @var{file}
  @opindex --file
  @itemx --file=@var{file}
+ @opindex --find-file
+ @itemx --find-file=@var{file}
+ @opindex --visit
+ @itemx --visit=@var{file}
  @cindex visiting files, command-line argument
  @vindex inhibit-startup-buffer-menu
  Visit @var{file} using @code{find-file}.  @xref{Visiting}.
***************
*** 107,112 ****
--- 115,126 ----
  directory, or in the Emacs library search path as specified
  with @env{EMACSLOADPATH} (@pxref{General Variables}).
  
+ @item -L @var{dir}
+ @opindex -L
+ @itemx --directory=@var{dir}
+ @opindex --directory
+ Add directory @var{dir} to the variable @code{load-path}.
+ 
  @item -f @var{function}
  @opindex -f
  @itemx --funcall=@var{function}
***************
*** 133,145 ****
  @item --kill
  @opindex --kill
  Exit from Emacs without asking for confirmation.
- @end table
  
! @vindex command-line-args
!   The init file can access the values of the action arguments as the
! elements of a list in the variable @code{command-line-args}.  The init
! file can override the normal processing of the action arguments, or
! define new ones, by reading and setting this variable.
  
  @node Initial Options
  @appendixsec Initial Options
--- 147,162 ----
  @item --kill
  @opindex --kill
  Exit from Emacs without asking for confirmation.
  
! @item --help
! @opindex --help
! Print a usage message listing all available options, then exit
! successfully.
! 
! @item --version
! @opindex --version
! Print Emacs version, then exit successfully.
! @end table
  
  @node Initial Options
  @appendixsec Initial Options
***************
*** 162,167 ****
--- 179,185 ----
  @opindex --terminal
  @cindex device for Emacs terminal I/O
  Use @var{device} as the device for terminal input and output.
+ @samp{--terminal} implies @samp{--no-window-system}.
  
  @item -d @var{display}
  @opindex -d
***************
*** 182,191 ****
  and input.
  
  @need 3000
! @cindex batch mode
! @item -batch
  @opindex --batch
! @itemx --batch
  Run Emacs in @dfn{batch mode}, which means that the text being edited is
  not displayed and the standard terminal interrupt characters such as
  @kbd{C-z} and @kbd{C-c} continue to have their normal effect.  Emacs in
--- 200,208 ----
  and input.
  
  @need 3000
! @item --batch
  @opindex --batch
! @cindex batch mode
  Run Emacs in @dfn{batch mode}, which means that the text being edited is
  not displayed and the standard terminal interrupt characters such as
  @kbd{C-z} and @kbd{C-c} continue to have their normal effect.  Emacs in
***************
*** 205,210 ****
--- 222,228 ----
  
  @item --script @var{file}
  @opindex --script
+ @cindex script mode
  Run Emacs in batch mode, like @samp{--batch}, and then read and
  execute the Lisp code in @var{file}.
  
***************
*** 224,234 ****
  @opindex -q
  @itemx --no-init-file
  @opindex --no-init-file
! @cindex bypassing init and site-start file
  @cindex init file, not loading
  @cindex @file{default.el} file, not loading
  Do not load your Emacs init file @file{~/.emacs}, or @file{default.el}
! either.  When invoked like this, Emacs does not allow saving options
  changed with the @kbd{M-x customize} command and its variants.
  @xref{Easy Customization}.
  
--- 242,253 ----
  @opindex -q
  @itemx --no-init-file
  @opindex --no-init-file
! @cindex bypassing init and @file{default.el} file
  @cindex init file, not loading
  @cindex @file{default.el} file, not loading
  Do not load your Emacs init file @file{~/.emacs}, or @file{default.el}
! either.  Regardless of this switch, @file{site-start.el} is still loaded.
! When invoked like this, Emacs does not allow saving options
  changed with the @kbd{M-x customize} command and its variants.
  @xref{Easy Customization}.
  
***************
*** 236,242 ****
  @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 is
  the only option that blocks it.
  
  @item --no-splash
--- 255,261 ----
  @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 is
  the only option that blocks it.
  
  @item --no-splash
***************
*** 245,250 ****
--- 264,273 ----
  Do not display a splash screen on startup; this is equivalent to
  setting the variable @code{inhibit-startup-message} to non-@code{nil}.
  
+ @item --no-desktop
+ @opindex --no-desktop
+ Do not reload any saved desktop.  @xref{Saving Emacs Sessions}.
+ 
  @item -u @var{user}
  @opindex -u
  @itemx --user=@var{user}
***************
*** 260,265 ****
--- 283,290 ----
  
  @item --unibyte
  @opindex --unibyte
+ @itemx --no-multibyte
+ @opindex --no-multibyte
  @cindex unibyte operation, command-line argument
  Do almost everything with single-byte buffers and strings.
  All buffers and strings are unibyte unless you (or a Lisp program)
***************
*** 270,275 ****
--- 295,302 ----
  
  @item --multibyte
  @opindex --multibyte
+ @itemx --no-unibyte
+ @opindex --no-unibyte
  Inhibit the effect of @env{EMACS_UNIBYTE}, so that Emacs
  uses multibyte characters by default, as usual.
  @end table
***************
*** 290,296 ****
  This says to visit @file{foo.c}, load @file{hack-c.el} (which makes
  changes in the visited file), save @file{foo.c} (note that
  @code{save-buffer} is the function that @kbd{C-x C-s} is bound to), and
! then exit back to the shell (because of @samp{-batch}).  @samp{-batch}
  also guarantees there will be no problem redirecting output to
  @file{log}, because Emacs will not assume that it has a display terminal
  to work with.
--- 317,323 ----
  This says to visit @file{foo.c}, load @file{hack-c.el} (which makes
  changes in the visited file), save @file{foo.c} (note that
  @code{save-buffer} is the function that @kbd{C-x C-s} is bound to), and
! then exit back to the shell (because of @samp{--batch}).  @samp{--batch}
  also guarantees there will be no problem redirecting output to
  @file{log}, because Emacs will not assume that it has a display terminal
  to work with.
***************
*** 944,957 ****
  @table @samp
  @item -g @var{width}x@var{height}@r{[@{}+-@r{@}}@var{xoffset}@r{@{}+-@r{@}}@var{yoffset}@r{]]}
  @opindex -g
  Specify the size @var{width} and @var{height} (measured in character
  columns and lines), and positions @var{xoffset} and @var{yoffset}
  (measured in pixels).  This applies to all frames.
  
- @item --geometry=@var{width}x@var{height}@r{[@{}+-@r{@}}@var{xoffset}@r{@{}+-@r{@}}@var{yoffset}@r{]]}
- @opindex --geometry
- This is another way of writing the same thing.
- 
  @item -fs
  @opindex -fs
  @itemx --fullscreen
--- 971,983 ----
  @table @samp
  @item -g @var{width}x@var{height}@r{[@{}+-@r{@}}@var{xoffset}@r{@{}+-@r{@}}@var{yoffset}@r{]]}
  @opindex -g
+ @itemx --geometry=@var{width}x@var{height}@r{[@{}+-@r{@}}@var{xoffset}@r{@{}+-@r{@}}@var{yoffset}@r{]]}
+ @opindex --geometry
+ @cindex geometry, command-line argument
  Specify the size @var{width} and @var{height} (measured in character
  columns and lines), and positions @var{xoffset} and @var{yoffset}
  (measured in pixels).  This applies to all frames.
  
  @item -fs
  @opindex -fs
  @itemx --fullscreen
***************
*** 1029,1035 ****
  @file{~/.emacs} file disables the tool bar, you will end up with a
  frame geometry different from what you asked for.  To get the intended
  size with no tool bar, use an X resource to specify ``no tool bar''
! (@pxref{Table of Resources});then Emacs will already know there's no
  tool bar when it processes the specified geometry.
  
    When using one of @samp{--fullscreen}, @samp{--fullwidth} or
--- 1055,1061 ----
  @file{~/.emacs} file disables the tool bar, you will end up with a
  frame geometry different from what you asked for.  To get the intended
  size with no tool bar, use an X resource to specify ``no tool bar''
! (@pxref{Table of Resources}); then Emacs will already know there's no
  tool bar when it processes the specified geometry.
  
    When using one of @samp{--fullscreen}, @samp{--fullwidth} or
***************
*** 1057,1069 ****
  @opindex -ib
  @itemx --internal-border=@var{width}
  @opindex --internal-border
! @cindex border width, command-line argument
! Specify @var{width} as the width of the internal border, in pixels.
  
  @item -bw @var{width}
  @opindex -bw
  @itemx --border-width=@var{width}
  @opindex --border-width
  Specify @var{width} as the width of the main border, in pixels.
  @end table
  
--- 1083,1097 ----
  @opindex -ib
  @itemx --internal-border=@var{width}
  @opindex --internal-border
! @cindex internal border width, command-line argument
! Specify @var{width} as the width of the internal border between text
! and main border, in pixels.
  
  @item -bw @var{width}
  @opindex -bw
  @itemx --border-width=@var{width}
  @opindex --border-width
+ @cindex main border width, command-line argument
  Specify @var{width} as the width of the main border, in pixels.
  @end table
  
***************
*** 1091,1101 ****
  line option:
  
  @table @samp
! @item -title @var{title}
! @opindex --title
! @itemx --title=@var{title}
! @itemx -T @var{title}
  @opindex -T
  @cindex frame title, command-line argument
  Specify @var{title} as the title for the initial Emacs frame.
  @end table
--- 1119,1128 ----
  line option:
  
  @table @samp
! @item -T @var{title}
  @opindex -T
+ @itemx --title=@var{title}
+ @opindex --title
  @cindex frame title, command-line argument
  Specify @var{title} as the title for the initial Emacs frame.
  @end table
***************
*** 1121,1129 ****
  @cindex Emacs icon, a gnu
  Use a picture of a gnu as the Emacs icon.
  
! @item -iconic
  @opindex --iconic
- @itemx --iconic
  @cindex start iconified, command-line argument
  Start Emacs in iconified state.
  @end table
--- 1148,1155 ----
  @cindex Emacs icon, a gnu
  Use a picture of a gnu as the Emacs icon.
  
! @item --iconic
  @opindex --iconic
  @cindex start iconified, command-line argument
  Start Emacs in iconified state.
  @end table
***************
*** 1137,1142 ****
--- 1163,1197 ----
  rather than showing a frame right away.  In this situation, the icon
  is the only indication that Emacs has started; the text frame doesn't
  appear until you deiconify it.
+ 
+ @node Misc X
+ @appendixsec Other Display Options
+ 
+ @table @samp
+ @item -hb
+ @opindex -hb
+ @itemx --horizontal-scroll-bars
+ @opindex --horizontal-scroll-bars
+ @cindex horizontal scroll bars, command-line argument
+ Enable horizontal scroll bars.
+ 
+ @item -vb
+ @opindex -vb
+ @itemx --vertical-scroll-bars
+ @opindex --vertical-scroll-bars
+ @cindex vertical scroll bars, command-line argument
+ Enable vertical scroll bars.
+ 
+ @item -lsp @var{pixels}
+ @opindex -lsp
+ @itemx --line-spacing=@var{pixels}
+ @opindex --line-spacing
+ @cindex line spacing, command-line argument
+ Specify @var{pixels} as additional space to put between lines, in pixels.
+ @end table
+ 
+   The @samp{--xrm} option (@pxref{Resources}) specifies additional
+ X resource values.
  
  @ignore
     arch-tag: fffecd9e-7329-4a51-a3cc-dd4a9889340e
Index: emacs/lisp/startup.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/startup.el,v
retrieving revision 1.324
diff -c -r1.324 startup.el
*** emacs/lisp/startup.el	19 Sep 2003 22:42:24 -0000	1.324
--- emacs/lisp/startup.el	8 Feb 2004 06:52:27 -0000
***************
*** 25,125 ****
  
  ;;; Commentary:
  
! ;; This file parses the command line and gets Emacs running.  Options on
! ;; the command line are handled in precedence order.  The order is the
! ;; one in the list below; first described means first handled.  Options
! ;; within each category (delimited by a bar) are handled in the order
! ;; encountered on the command line.
! 
! ;; -------------------------
! ;; -version                  Print Emacs version to stderr, then exit
! ;; --version                 successfully right away.
! ;;                           This option is handled by emacs.c
! ;; -------------------------
! ;; -help                     Print a short usage description and exit
! ;; --help                    successfully right away.
! ;;                           This option is handled by emacs.c
! ;; -------------------------
! ;; -nl                       Do not use shared memory (for systems that
! ;; -no-shared-memory         support this) for the dumped Emacs data.
! ;;                           This option is handled by emacs.c
! ;;
! ;; -map                      For VMS.
! ;; --map-data                This option is handled by emacs.c
! ;; -------------------------
! ;; -t FILE                   Use FILE as the name of the terminal.
! ;; --terminal FILE           Using this implies "-nw" also.
! ;;                           This option is handled by emacs.c
! ;; -------------------------
! ;; -d DISPNAME               Use DISPNAME as the name of the X
! ;; -display DISPNAME         display for the initial frame.
! ;; --display DISPNAME        This option is handled by emacs.c
! ;; -------------------------
! ;; -nw                       Do not use a windows system (but use the
! ;; --no-window-system        terminal instead.)
! ;;                           This option is handled by emacs.c
! ;; -------------------------
! ;; -batch                    Execute noninteractively (messages go to stdout,
! ;; --batch                   variable noninteractive set to t)
! ;;                           This option is handled by emacs.c
! ;; -------------------------
! ;; -q                        Do not load user's init file and do not load
! ;; -no-init-file             "default.el".  Regardless of this switch,
! ;; --no-init-file            "site-start" is still loaded.
! ;; -------------------------
! ;; -no-site-file             Do not load "site-start.el".  (This is the ONLY
! ;; --no-site-file            way to prevent loading that file.)
! ;; -------------------------
! ;; -no-splash                 Don't display a splash screen on startup.
! ;; --no-splash
! ;; -------------------------
! ;; -u USER                   Load USER's init file instead of the init
! ;; -user USER                file belonging to the user starting Emacs.
! ;; --user USER
! ;; -------------------------
! ;; -debug-init               Don't catch errors in init files; let the
! ;; --debug-init              debugger run.
! ;; -------------------------
! ;; -i ICONTYPE               Set type of icon using when Emacs is
! ;; -itype ICONTYPE           iconified under X.
! ;; --icon-type ICONTYPE      This option is passed on to term/x-win.el
! ;;
! ;; -iconic                   Start Emacs iconified.
! ;; --iconic                  This option is passed on to term/x-win.el
! ;; -------------------------
! ;; Various X options for colors/fonts/geometry/title etc.
! ;; These options are passed on to term/x-win.el which see.
! ;; -------------------------
! ;; FILE                      Visit FILE.
! ;; -visit FILE
! ;; --visit FILE
! ;; -file FILE
! ;; --file FILE
! ;;
! ;; -L DIRNAME                Add DIRNAME to load-path
! ;; -directory DIRNAME
! ;; --directory DIRNAME
! ;;
! ;; -l FILE                   Load and execute the Emacs lisp code
! ;; -load FILE                in FILE.
! ;; --load FILE
! ;;
! ;; -f FUNC                   Execute Emacs lisp function FUNC with
! ;; -funcall FUNC             no arguments.  The "-e" form is outdated
! ;; --funcall FUNC            and should not be used.  (It's a typo
! ;; -e FUNC                   promoted to a feature.)
! ;;
! ;; -eval FORM                Execute Emacs lisp form FORM.
! ;; --eval FORM
! ;; -execute EXPR
! ;; --execute EXPR
! ;;
! ;; -insert FILE              Insert the contents of FILE into buffer.
! ;; --insert FILE
! ;; -------------------------
! ;; -kill                     Kill (exit) Emacs right away.
! ;; --kill
! ;; -------------------------
  
  ;;; Code:
  
--- 25,33 ----
  
  ;;; Commentary:
  
! ;; This file parses the command line and gets Emacs running.  Options
! ;; on the command line are handled in precedence order.  For priorities
! ;; see the structure standard_args in the emacs.c file.
  
  ;;; Code:
  
Index: emacs/src/emacs.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/emacs.c,v
retrieving revision 1.330
diff -c -r1.330 emacs.c
*** emacs/src/emacs.c	16 Nov 2003 16:17:09 -0000	1.330
--- emacs/src/emacs.c	8 Feb 2004 06:52:28 -0000
***************
*** 232,297 ****
  \n\
  Initialization options:\n\
  \n\
! --batch			do not do interactive display; implies -q\n\
! --script FILE           run FILE as an Emacs Lisp script.\n\
! --debug-init		enable Emacs Lisp debugger during init file\n\
! --help			display this help message and exit\n\
! --multibyte, --no-unibyte   run Emacs in multibyte mode\n\
! --no-init-file, -q	    load neither ~/.emacs nor default.el\n\
! --no-shared-memory, -nl	    do not use shared memory\n\
! --no-site-file		    do not load site-start.el\n\
! --no-splash		    do not display a splash screen on startup\n\
! --no-window-system, -nw	    don't communicate with X, ignoring $DISPLAY\n\
! --terminal, -t DEVICE	    use DEVICE for terminal I/O\n\
  --unibyte, --no-multibyte   run Emacs in unibyte mode\n\
! --user, -u USER		load ~USER/.emacs instead of your own\n\
! --version		display version information and exit\n\
  \n\
  Action options:\n\
  \n\
! FILE			visit FILE using find-file\n\
! +LINE FILE		visit FILE using find-file, then go to line LINE\n\
! +LINE:COLUMN FILE	visit FILE using find-file, then go to line LINE,\n\
! 			    column COLUMN\n\
! --directory, -L DIR	add DIR to variable load-path\n\
! --eval EXPR		evaluate Emacs Lisp expression EXPR\n\
! --execute EXPR		evaluate Emacs Lisp expression EXPR\n\
! --find-file FILE	visit FILE\n\
! --funcall, -f FUNC	call Emacs function FUNC with no arguments\n\
! --insert FILE		insert contents of FILE into current buffer\n\
! --kill			exit without asking for confirmation\n\
! --load, -l FILE		load FILE of Emacs Lisp code using the load function\n\
! --visit FILE		visit FILE\n\
  \n"
  
  #define USAGE2 "\
  Display options:\n\
  \n\
! --background-color, -bg COLOR	window background color\n\
! --border-color, -bd COLOR	main border color\n\
! --border-width, -bw WIDTH	width of main border\n\
! --color=MODE			color mode for character terminals;\n\
! 				MODE defaults to `auto', and can also\n\
! 				be `never', `auto', `always',\n\
! 				or a mode name like `ansi8'\n\
! --cursor-color, -cr COLOR	color of the Emacs cursor indicating point\n\
! --display, -d DISPLAY		use X server DISPLAY\n\
! --font, -fn FONT		default font; must be fixed-width\n\
! --foreground-color, -fg COLOR	window foreground color\n\
! --fullscreen, -fs	        make first frame fullscreen\n\
! --fullwidth, -fw	        make the first frame wide as the screen\n\
! --fullheight, -fh	        make the first frame high as the screen\n\
! --geometry, -g GEOMETRY		window geometry\n\
! --iconic			start Emacs in iconified state\n\
! --icon-type, -i			use picture of gnu for Emacs icon\n\
! --internal-border, -ib WIDTH	width between text and main border\n\
! --line-spacing, -lsp PIXELS	additional space to put between lines\n\
! --mouse-color, -ms COLOR 	mouse cursor color in Emacs window\n\
! --name NAME			title of main Emacs window\n\
! --reverse-video, -r, -rv	switch foreground and background\n\
! --title, -T, -wn TITLE		title for Emacs windows\n\
! --vertical-scroll-bars, -vb	enable vertical scroll bars\n\
! --xrm XRESOURCES		set additional X resources\n\
  \n\
  You can generally also specify long option names with a single -; for\n\
  example, -batch as well as --batch.  You can use any unambiguous\n\
--- 232,300 ----
  \n\
  Initialization options:\n\
  \n\
! --batch                     do not do interactive display; implies -q\n\
! --debug-init                enable Emacs Lisp debugger for init file\n\
! --display, -d DISPLAY       use X server DISPLAY\n\
! --multibyte, --no-unibyte   inhibit the effect of EMACS_UNIBYTE\n\
! --no-desktop                do not load a saved desktop\n\
! --no-init-file, -q          load neither ~/.emacs nor default.el\n\
! --no-shared-memory, -nl     do not use shared memory\n\
! --no-site-file              do not load site-start.el\n\
! --no-splash                 do not display a splash screen on startup\n\
! --no-window-system, -nw     don't communicate with X, ignoring $DISPLAY\n\
! --script FILE               run FILE as an Emacs Lisp script\n\
! --terminal, -t DEVICE       use DEVICE for terminal I/O\n\
  --unibyte, --no-multibyte   run Emacs in unibyte mode\n\
! --user, -u USER             load ~USER/.emacs instead of your own\n\
  \n\
  Action options:\n\
  \n\
! FILE                    visit FILE using find-file\n\
! +LINE FILE              visit FILE using find-file, then go to line LINE\n\
! +LINE:COLUMN FILE       visit FILE using find-file, then go to line LINE,\n\
!                           column COLUMN\n\
! --directory, -L DIR     add DIR to variable load-path\n\
! --eval EXPR             evaluate Emacs Lisp expression EXPR\n\
! --execute EXPR          evaluate Emacs Lisp expression EXPR\n\
! --file FILE             visit FILE using find-file\n\
! --find-file FILE        visit FILE using find-file\n\
! --funcall, -f FUNC      call Emacs Lisp function FUNC with no arguments\n\
! --insert FILE           insert contents of FILE into current buffer\n\
! --kill                  exit without asking for confirmation\n\
! --load, -l FILE         load Emacs Lisp FILE using the load function\n\
! --visit FILE            visit FILE using find-file\n\
  \n"
  
  #define USAGE2 "\
  Display options:\n\
  \n\
! --background-color, -bg COLOR   window background color\n\
! --border-color, -bd COLOR       main border color\n\
! --border-width, -bw WIDTH       width of main border\n\
! --color MODE                    color mode for character terminals;\n\
!                                   MODE defaults to `auto', and can also\n\
!                                   be `never', `auto', `always',\n\
!                                   or a mode name like `ansi8'\n\
! --cursor-color, -cr COLOR       color of the Emacs cursor indicating point\n\
! --font, -fn FONT                default font; must be fixed-width\n\
! --foreground-color, -fg COLOR   window foreground color\n\
! --fullheight, -fh               make the first frame high as the screen\n\
! --fullscreen, -fs               make first frame fullscreen\n\
! --fullwidth, -fw                make the first frame wide as the screen\n\
! --geometry, -g GEOMETRY         window geometry\n\
! --horizontal-scroll-bars, -hb   enable horizontal scroll bars\n\
! --icon-type, -i                 use picture of gnu for Emacs icon\n\
! --iconic                        start Emacs in iconified state\n\
! --internal-border, -ib WIDTH    width between text and main border\n\
! --line-spacing, -lsp PIXELS     additional space to put between lines\n\
! --mouse-color, -ms COLOR        mouse cursor color in Emacs window\n\
! --name NAME                     title for initial Emacs frame\n\
! --reverse-video, -r, -rv        switch foreground and background\n\
! --title, -T TITLE               title for initial Emacs frame\n\
! --vertical-scroll-bars, -vb     enable vertical scroll bars\n\
! --xrm XRESOURCES                set additional X resources\n\
! --help                          display this help and exit\n\
! --version                       output version information and exit\n\
  \n\
  You can generally also specify long option names with a single -; for\n\
  example, -batch as well as --batch.  You can use any unambiguous\n\

-- 
http://www.jurta.org/emacs/