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

[Richard M. Stallman]

Index: emacs/src/emacs.c
diff -c emacs/src/emacs.c:1.317 emacs/src/emacs.c:1.318
*** emacs/src/emacs.c:1.317     Mon Aug 26 21:00:55 2002
--- emacs/src/emacs.c   Tue Aug 27 14:45:24 2002
***************
*** 228,233 ****
--- 228,234 ----
  Initialization options:\n\
  \n\
  --batch                       do not do interactive display; implies -q\n\
+ --script FILE           run FILE as an Emacs Lisp script.
  --debug-init          enable Emacs Lisp debugger during init file\n\
  --help                        display this help message and exit\n\
  --multibyte, --no-unibyte   run Emacs in multibyte mode\n\
***************
*** 779,784 ****
--- 780,786 ----
    struct rlimit rlim;
  #endif
    int no_loadup = 0;
+   char *junk = 0;
  
  #if GC_MARK_STACK
    extern Lisp_Object *stack_base;
***************
*** 1033,1038 ****
--- 1035,1049 ----
    noninteractive = 0;
    if (argmatch (argv, argc, "-batch", "--batch", 5, NULL, &skip_args))
      noninteractive = 1;
+   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);
+     }
  
    /* Handle the --help option, which gives a usage message.  */
    if (argmatch (argv, argc, "-help", "--help", 3, NULL, &skip_args))
***************
*** 1658,1663 ****
--- 1669,1675 ----
    { "-nw", "--no-window-system", 110, 0 },
    { "-nw", "--no-windows", 110, 0 },
    { "-batch", "--batch", 100, 0 },
+   { "-script", "--script", 100, 1 },
    { "-help", "--help", 90, 0 },
    { "-no-unibyte", "--no-unibyte", 83, 0 },
    { "-multibyte", "--multibyte", 82, 0 },