Mercurial > emacs
comparison src/emacs.c @ 64775:17ea5769514d
(endif): Convert -script into -scriptload.
(standard_args): Add -scriptload. Allow -basic-display with one dash.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sun, 07 Aug 2005 17:38:36 +0000 |
parents | a0d1312ede66 |
children | 0e4df13dd5ba 2d92f5c9d6ae |
comparison
equal
deleted
inserted
replaced
64774:369c84bf493f | 64775:17ea5769514d |
---|---|
1151 Vundo_outer_limit = Qnil; | 1151 Vundo_outer_limit = Qnil; |
1152 } | 1152 } |
1153 if (argmatch (argv, argc, "-script", "--script", 3, &junk, &skip_args)) | 1153 if (argmatch (argv, argc, "-script", "--script", 3, &junk, &skip_args)) |
1154 { | 1154 { |
1155 noninteractive = 1; /* Set batch mode. */ | 1155 noninteractive = 1; /* Set batch mode. */ |
1156 /* Convert --script to -l, un-skip it, and sort again so that -l will be | 1156 /* Convert --script to --scriptload, un-skip it, and sort again |
1157 handled in proper sequence. */ | 1157 so that it will be handled in proper sequence. */ |
1158 argv[skip_args - 1] = "-l"; | 1158 argv[skip_args - 1] = "-scriptload"; |
1159 skip_args -= 2; | 1159 skip_args -= 2; |
1160 sort_args (argc, argv); | 1160 sort_args (argc, argv); |
1161 } | 1161 } |
1162 | 1162 |
1163 /* Handle the --help option, which gives a usage message. */ | 1163 /* Handle the --help option, which gives a usage message. */ |
1832 { "-debug-init", "--debug-init", 20, 0 }, | 1832 { "-debug-init", "--debug-init", 20, 0 }, |
1833 { "-i", "--icon-type", 15, 0 }, | 1833 { "-i", "--icon-type", 15, 0 }, |
1834 { "-itype", 0, 15, 0 }, | 1834 { "-itype", 0, 15, 0 }, |
1835 { "-iconic", "--iconic", 15, 0 }, | 1835 { "-iconic", "--iconic", 15, 0 }, |
1836 { "-D", "--basic-display", 12, 0}, | 1836 { "-D", "--basic-display", 12, 0}, |
1837 { "--basic-display", 0, 12, 0}, | 1837 { "-basic-display", 0, 12, 0}, |
1838 { "-bg", "--background-color", 10, 1 }, | 1838 { "-bg", "--background-color", 10, 1 }, |
1839 { "-background", 0, 10, 1 }, | 1839 { "-background", 0, 10, 1 }, |
1840 { "-fg", "--foreground-color", 10, 1 }, | 1840 { "-fg", "--foreground-color", 10, 1 }, |
1841 { "-foreground", 0, 10, 1 }, | 1841 { "-foreground", 0, 10, 1 }, |
1842 { "-bd", "--border-color", 10, 1 }, | 1842 { "-bd", "--border-color", 10, 1 }, |
1866 so they are not reordered with respect to those. */ | 1866 so they are not reordered with respect to those. */ |
1867 { "-L", "--directory", 0, 1 }, | 1867 { "-L", "--directory", 0, 1 }, |
1868 { "-directory", 0, 0, 1 }, | 1868 { "-directory", 0, 0, 1 }, |
1869 { "-l", "--load", 0, 1 }, | 1869 { "-l", "--load", 0, 1 }, |
1870 { "-load", 0, 0, 1 }, | 1870 { "-load", 0, 0, 1 }, |
1871 { "-scriptload", "--scriptload", 0, 1 }, | |
1871 { "-f", "--funcall", 0, 1 }, | 1872 { "-f", "--funcall", 0, 1 }, |
1872 { "-funcall", 0, 0, 1 }, | 1873 { "-funcall", 0, 0, 1 }, |
1873 { "-eval", "--eval", 0, 1 }, | 1874 { "-eval", "--eval", 0, 1 }, |
1874 { "-execute", "--execute", 0, 1 }, | 1875 { "-execute", "--execute", 0, 1 }, |
1875 { "-find-file", "--find-file", 0, 1 }, | 1876 { "-find-file", "--find-file", 0, 1 }, |