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

1 files changed, 54 insertions, 51 deletions

diff --git a/src/emacs.c b/src/emacs.c
index fa6fa5a061a..54c2b1dbf76 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -232,66 +232,69 @@ read the main documentation for these command-line arguments.\n\
 \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\
+--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\
---version               display version information and exit\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\
---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\
+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\
---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\
+--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\