Commit e09b9180 authored by Richard M. Stallman's avatar Richard M. Stallman

(endif): Convert -script into -scriptload.

(standard_args): Add -scriptload.  Allow -basic-display with one dash.
parent 780a7814
...@@ -1153,9 +1153,9 @@ main (argc, argv ...@@ -1153,9 +1153,9 @@ main (argc, argv
if (argmatch (argv, argc, "-script", "--script", 3, &junk, &skip_args)) if (argmatch (argv, argc, "-script", "--script", 3, &junk, &skip_args))
{ {
noninteractive = 1; /* Set batch mode. */ noninteractive = 1; /* Set batch mode. */
/* Convert --script to -l, un-skip it, and sort again so that -l will be /* Convert --script to --scriptload, un-skip it, and sort again
handled in proper sequence. */ so that it will be handled in proper sequence. */
argv[skip_args - 1] = "-l"; argv[skip_args - 1] = "-scriptload";
skip_args -= 2; skip_args -= 2;
sort_args (argc, argv); sort_args (argc, argv);
} }
...@@ -1834,7 +1834,7 @@ struct standard_args standard_args[] = ...@@ -1834,7 +1834,7 @@ struct standard_args standard_args[] =
{ "-itype", 0, 15, 0 }, { "-itype", 0, 15, 0 },
{ "-iconic", "--iconic", 15, 0 }, { "-iconic", "--iconic", 15, 0 },
{ "-D", "--basic-display", 12, 0}, { "-D", "--basic-display", 12, 0},
{ "--basic-display", 0, 12, 0}, { "-basic-display", 0, 12, 0},
{ "-bg", "--background-color", 10, 1 }, { "-bg", "--background-color", 10, 1 },
{ "-background", 0, 10, 1 }, { "-background", 0, 10, 1 },
{ "-fg", "--foreground-color", 10, 1 }, { "-fg", "--foreground-color", 10, 1 },
...@@ -1868,6 +1868,7 @@ struct standard_args standard_args[] = ...@@ -1868,6 +1868,7 @@ struct standard_args standard_args[] =
{ "-directory", 0, 0, 1 }, { "-directory", 0, 0, 1 },
{ "-l", "--load", 0, 1 }, { "-l", "--load", 0, 1 },
{ "-load", 0, 0, 1 }, { "-load", 0, 0, 1 },
{ "-scriptload", "--scriptload", 0, 1 },
{ "-f", "--funcall", 0, 1 }, { "-f", "--funcall", 0, 1 },
{ "-funcall", 0, 0, 1 }, { "-funcall", 0, 0, 1 },
{ "-eval", "--eval", 0, 1 }, { "-eval", "--eval", 0, 1 },
......
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