diff options
| author | Eli Zaretskii <eliz@is.elta.co.il> | 2004-02-21 17:45:10 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@is.elta.co.il> | 2004-02-21 17:45:10 +0000 |
| commit | f8125c39dd43cc91abbbc3f584e2125136ce5f3e (patch) | |
| tree | dc109b97834d13a38e8d2d2e0f6a8cf6fa9f5f4c /src | |
| parent | 9c5609e8cccc9eec6ec9444f91e5ed2c554f6b50 (diff) | |
| download | emacs-f8125c39dd43cc91abbbc3f584e2125136ce5f3e.tar.gz | |
(USAGE1): Split into two halves.
(USAGE2): Second half of the old USAGE1.
(USAGE3): Renamed from USAGE2.
(USAGE4): Renamed from USAGE3.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/emacs.c | 16 |
2 files changed, 17 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b3cae7c7296..24dff3e8d25 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +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> * emacs.c (USAGE1): Add --no-desktop. Move --display from USAGE2. diff --git a/src/emacs.c b/src/emacs.c index 54c2b1dbf76..283f7949bfd 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -220,6 +220,8 @@ int initial_argc; static void sort_args (); 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 "\ Usage: %s [OPTION-OR-FILENAME]...\n\ \n\ @@ -246,7 +248,9 @@ Initialization options:\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\ +\n%s" + +#define USAGE2 "\ Action options:\n\ \n\ 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\ \n" -#define USAGE2 "\ +#define USAGE3 "\ Display options:\n\ \n\ --background-color, -bg COLOR window background color\n\ @@ -304,7 +308,7 @@ Various environment variables and window system resources also affect\n\ Emacs' operation. See the main documentation.\n\ \n" -#define USAGE3 "\ +#define USAGE4 "\ Report bugs to %s. First, please see the Bugs\n\ section of the Emacs manual or the file BUGS.\n" @@ -1064,9 +1068,9 @@ main (argc, argv /* Handle the --help option, which gives a usage message. */ if (argmatch (argv, argc, "-help", "--help", 3, NULL, &skip_args)) { - printf (USAGE1, argv[0]); - printf (USAGE2); - printf (USAGE3, bug_reporting_address ()); + printf (USAGE1, argv[0], USAGE2); + printf (USAGE3); + printf (USAGE4, bug_reporting_address ()); exit (0); } |