Commit f8125c39 authored by Eli Zaretskii's avatar Eli Zaretskii

(USAGE1): Split into two halves.

(USAGE2): Second half of the old USAGE1.
(USAGE3): Renamed from USAGE2.
(USAGE4): Renamed from USAGE3.
parent 9c5609e8
2004-02-21 Eli Zaretskii <eliz@elta.co.il>
* emacs.c (USAGE1): Split into two halves.
(USAGE2): Second half of the old USAGE1.
(USAGE3): Renamed from USAGE2.
(USAGE4): Renamed from USAGE3.
2004-02-21 Juri Linkov <juri@jurta.org> 2004-02-21 Juri Linkov <juri@jurta.org>
* emacs.c (USAGE1): Add --no-desktop. Move --display from USAGE2. * emacs.c (USAGE1): Add --no-desktop. Move --display from USAGE2.
......
...@@ -220,6 +220,8 @@ int initial_argc; ...@@ -220,6 +220,8 @@ int initial_argc;
static void sort_args (); static void sort_args ();
void syms_of_emacs (); void syms_of_emacs ();
/* MSVC needs each string be shorter than 2048 bytes, so the usage
strings below are split to not overflow this limit. */
#define USAGE1 "\ #define USAGE1 "\
Usage: %s [OPTION-OR-FILENAME]...\n\ Usage: %s [OPTION-OR-FILENAME]...\n\
\n\ \n\
...@@ -246,7 +248,9 @@ Initialization options:\n\ ...@@ -246,7 +248,9 @@ Initialization options:\n\
--terminal, -t DEVICE use DEVICE for terminal I/O\n\ --terminal, -t DEVICE use DEVICE for terminal I/O\n\
--unibyte, --no-multibyte run Emacs in unibyte mode\n\ --unibyte, --no-multibyte run Emacs in unibyte mode\n\
--user, -u USER load ~USER/.emacs instead of your own\n\ --user, -u USER load ~USER/.emacs instead of your own\n\
\n\ \n%s"
#define USAGE2 "\
Action options:\n\ Action options:\n\
\n\ \n\
FILE visit FILE using find-file\n\ FILE visit FILE using find-file\n\
...@@ -265,7 +269,7 @@ FILE visit FILE using find-file\n\ ...@@ -265,7 +269,7 @@ FILE visit FILE using find-file\n\
--visit FILE visit FILE using find-file\n\ --visit FILE visit FILE using find-file\n\
\n" \n"
#define USAGE2 "\ #define USAGE3 "\
Display options:\n\ Display options:\n\
\n\ \n\
--background-color, -bg COLOR window background color\n\ --background-color, -bg COLOR window background color\n\
...@@ -304,7 +308,7 @@ Various environment variables and window system resources also affect\n\ ...@@ -304,7 +308,7 @@ Various environment variables and window system resources also affect\n\
Emacs' operation. See the main documentation.\n\ Emacs' operation. See the main documentation.\n\
\n" \n"
#define USAGE3 "\ #define USAGE4 "\
Report bugs to %s. First, please see the Bugs\n\ Report bugs to %s. First, please see the Bugs\n\
section of the Emacs manual or the file BUGS.\n" section of the Emacs manual or the file BUGS.\n"
...@@ -1064,9 +1068,9 @@ main (argc, argv ...@@ -1064,9 +1068,9 @@ main (argc, argv
/* Handle the --help option, which gives a usage message. */ /* Handle the --help option, which gives a usage message. */
if (argmatch (argv, argc, "-help", "--help", 3, NULL, &skip_args)) if (argmatch (argv, argc, "-help", "--help", 3, NULL, &skip_args))
{ {
printf (USAGE1, argv[0]); printf (USAGE1, argv[0], USAGE2);
printf (USAGE2); printf (USAGE3);
printf (USAGE3, bug_reporting_address ()); printf (USAGE4, bug_reporting_address ());
exit (0); exit (0);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment