[Emacs-diffs] Changes to emacs/src/emacs.c

[Richard M . Stallman]

Index: emacs/src/emacs.c
diff -c emacs/src/emacs.c:1.372 emacs/src/emacs.c:1.373
*** emacs/src/emacs.c:1.372     Sun Aug  7 12:33:16 2005
--- emacs/src/emacs.c   Sun Aug  7 17:38:36 2005
***************
*** 1153,1161 ****
    if (argmatch (argv, argc, "-script", "--script", 3, &junk, &skip_args))
      {
        noninteractive = 1;     /* Set batch mode.  */
!       /* Convert --script to -l, un-skip it, and sort again so that -l will be
!        handled in proper sequence.  */
!       argv[skip_args - 1] = "-l";
        skip_args -= 2;
        sort_args (argc, argv);
      }
--- 1153,1161 ----
    if (argmatch (argv, argc, "-script", "--script", 3, &junk, &skip_args))
      {
        noninteractive = 1;     /* Set batch mode.  */
!       /* Convert --script to --scriptload, un-skip it, and sort again
!        so that it will be handled in proper sequence.  */
!       argv[skip_args - 1] = "-scriptload";
        skip_args -= 2;
        sort_args (argc, argv);
      }
***************
*** 1834,1840 ****
    { "-itype", 0, 15, 0 },
    { "-iconic", "--iconic", 15, 0 },
    { "-D", "--basic-display", 12, 0},
!   { "--basic-display", 0, 12, 0},
    { "-bg", "--background-color", 10, 1 },
    { "-background", 0, 10, 1 },
    { "-fg", "--foreground-color", 10, 1 },
--- 1834,1840 ----
    { "-itype", 0, 15, 0 },
    { "-iconic", "--iconic", 15, 0 },
    { "-D", "--basic-display", 12, 0},
!   { "-basic-display", 0, 12, 0},
    { "-bg", "--background-color", 10, 1 },
    { "-background", 0, 10, 1 },
    { "-fg", "--foreground-color", 10, 1 },
***************
*** 1868,1873 ****
--- 1868,1874 ----
    { "-directory", 0, 0, 1 },
    { "-l", "--load", 0, 1 },
    { "-load", 0, 0, 1 },
+   { "-scriptload", "--scriptload", 0, 1 },
    { "-f", "--funcall", 0, 1 },
    { "-funcall", 0, 0, 1 },
    { "-eval", "--eval", 0, 1 },