Commit 400d6fa9 authored by Pavel Janík's avatar Pavel Janík

(USAGE1): Show command line option --no-window-system instead of

--no-windows in usage.
(standard_args): Rename --no-windows to --no-window-system.
(bug_reporting_address): Follow Emacs coding conventions.
parent 9dbc9081
...@@ -234,7 +234,7 @@ Initialization options:\n\ ...@@ -234,7 +234,7 @@ Initialization options:\n\
--no-init-file, -q load neither ~/.emacs nor default.el\n\ --no-init-file, -q load neither ~/.emacs nor default.el\n\
--no-shared-memory, -nl do not use shared memory\n\ --no-shared-memory, -nl do not use shared memory\n\
--no-site-file do not load site-start.el\n\ --no-site-file do not load site-start.el\n\
--no-windows, -nw don't communicate with X, ignoring $DISPLAY\n\ --no-window-system, -nw don't communicate with X, ignoring $DISPLAY\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\
...@@ -722,9 +722,10 @@ void (*__malloc_initialize_hook) () = malloc_initialize_hook; ...@@ -722,9 +722,10 @@ void (*__malloc_initialize_hook) () = malloc_initialize_hook;
/* This function is used to determine an address to which bug report should /* This function is used to determine an address to which bug report should
be sent. */ be sent. */
char *bug_reporting_address () char *
bug_reporting_address ()
{ {
int count=0; int count = 0;
Lisp_Object temp; Lisp_Object temp;
char *string; char *string;
...@@ -736,14 +737,17 @@ char *bug_reporting_address () ...@@ -736,14 +737,17 @@ char *bug_reporting_address ()
string = XSTRING (temp)->data; string = XSTRING (temp)->data;
do { /* Count dots in `emacs-version'. */
if (*string=='.') while (*string)
count++; {
} while (string++,*string); if (*string == '.')
count++;
string++;
}
/* When `emacs-version' has at least three dots, it is development or /* When `emacs-version' has at least three dots, it is development or
pretest version of Emacs. */ pretest version of Emacs. */
return (count>=3) ? REPORT_EMACS_BUG_PRETEST_ADDRESS : REPORT_EMACS_BUG_ADDRESS; return count >= 3 ? REPORT_EMACS_BUG_PRETEST_ADDRESS : REPORT_EMACS_BUG_ADDRESS;
} }
...@@ -999,7 +1003,10 @@ main (argc, argv, envp) ...@@ -999,7 +1003,10 @@ main (argc, argv, envp)
break; break;
} }
if (argmatch (argv, argc, "-nw", "--no-windows", 6, NULL, &skip_args)) /* Command line option --no-windows is deprecated and thus not mentioned
in the manual and usage informations. */
if (argmatch (argv, argc, "-nw", "--no-window-system", 6, NULL, &skip_args)
|| argmatch (argv, argc, "-nw", "--no-windows", 6, NULL, &skip_args))
inhibit_window_system = 1; inhibit_window_system = 1;
/* Handle the -batch switch, which means don't do interactive display. */ /* Handle the -batch switch, which means don't do interactive display. */
...@@ -1012,7 +1019,7 @@ main (argc, argv, envp) ...@@ -1012,7 +1019,7 @@ main (argc, argv, envp)
{ {
printf (USAGE1, argv[0]); printf (USAGE1, argv[0]);
printf (USAGE2); printf (USAGE2);
printf (USAGE3, bug_reporting_address()); printf (USAGE3, bug_reporting_address ());
exit (0); exit (0);
} }
...@@ -1620,6 +1627,7 @@ struct standard_args standard_args[] = ...@@ -1620,6 +1627,7 @@ struct standard_args standard_args[] =
{ "-map", "--map-data", 130, 0 }, { "-map", "--map-data", 130, 0 },
#endif #endif
{ "-t", "--terminal", 120, 1 }, { "-t", "--terminal", 120, 1 },
{ "-nw", "--no-window-system", 110, 0 },
{ "-nw", "--no-windows", 110, 0 }, { "-nw", "--no-windows", 110, 0 },
{ "-batch", "--batch", 100, 0 }, { "-batch", "--batch", 100, 0 },
{ "-help", "--help", 90, 0 }, { "-help", "--help", 90, 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