/[emacs]/emacs/src/emacs.c
ViewVC logotype

Diff of /emacs/src/emacs.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.372 by ttn, Sun Aug 7 12:33:16 2005 UTC revision 1.373 by rms, Sun Aug 7 17:38:36 2005 UTC
# Line 1153  main (argc, argv Line 1153  main (argc, argv
1153    if (argmatch (argv, argc, "-script", "--script", 3, &junk, &skip_args))    if (argmatch (argv, argc, "-script", "--script", 3, &junk, &skip_args))
1154      {      {
1155        noninteractive = 1;       /* Set batch mode.  */        noninteractive = 1;       /* Set batch mode.  */
1156        /* 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
1157           handled in proper sequence.  */           so that it will be handled in proper sequence.  */
1158        argv[skip_args - 1] = "-l";        argv[skip_args - 1] = "-scriptload";
1159        skip_args -= 2;        skip_args -= 2;
1160        sort_args (argc, argv);        sort_args (argc, argv);
1161      }      }
# Line 1834  struct standard_args standard_args[] = Line 1834  struct standard_args standard_args[] =
1834    { "-itype", 0, 15, 0 },    { "-itype", 0, 15, 0 },
1835    { "-iconic", "--iconic", 15, 0 },    { "-iconic", "--iconic", 15, 0 },
1836    { "-D", "--basic-display", 12, 0},    { "-D", "--basic-display", 12, 0},
1837    { "--basic-display", 0, 12, 0},    { "-basic-display", 0, 12, 0},
1838    { "-bg", "--background-color", 10, 1 },    { "-bg", "--background-color", 10, 1 },
1839    { "-background", 0, 10, 1 },    { "-background", 0, 10, 1 },
1840    { "-fg", "--foreground-color", 10, 1 },    { "-fg", "--foreground-color", 10, 1 },
# Line 1868  struct standard_args standard_args[] = Line 1868  struct standard_args standard_args[] =
1868    { "-directory", 0, 0, 1 },    { "-directory", 0, 0, 1 },
1869    { "-l", "--load", 0, 1 },    { "-l", "--load", 0, 1 },
1870    { "-load", 0, 0, 1 },    { "-load", 0, 0, 1 },
1871      { "-scriptload", "--scriptload", 0, 1 },
1872    { "-f", "--funcall", 0, 1 },    { "-f", "--funcall", 0, 1 },
1873    { "-funcall", 0, 0, 1 },    { "-funcall", 0, 0, 1 },
1874    { "-eval", "--eval", 0, 1 },    { "-eval", "--eval", 0, 1 },

Legend:
Removed from v.1.372  
changed lines
  Added in v.1.373

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26