/[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.317 by akochoi, Tue Aug 27 01:00:55 2002 UTC revision 1.318 by rms, Tue Aug 27 18:45:24 2002 UTC
# Line 228  read the main documentation for these co Line 228  read the main documentation for these co
228  Initialization options:\n\  Initialization options:\n\
229  \n\  \n\
230  --batch                 do not do interactive display; implies -q\n\  --batch                 do not do interactive display; implies -q\n\
231    --script FILE           run FILE as an Emacs Lisp script.
232  --debug-init            enable Emacs Lisp debugger during init file\n\  --debug-init            enable Emacs Lisp debugger during init file\n\
233  --help                  display this help message and exit\n\  --help                  display this help message and exit\n\
234  --multibyte, --no-unibyte   run Emacs in multibyte mode\n\  --multibyte, --no-unibyte   run Emacs in multibyte mode\n\
# Line 779  main (argc, argv, envp) Line 780  main (argc, argv, envp)
780    struct rlimit rlim;    struct rlimit rlim;
781  #endif  #endif
782    int no_loadup = 0;    int no_loadup = 0;
783      char *junk = 0;
784    
785  #if GC_MARK_STACK  #if GC_MARK_STACK
786    extern Lisp_Object *stack_base;    extern Lisp_Object *stack_base;
# Line 1033  main (argc, argv, envp) Line 1035  main (argc, argv, envp)
1035    noninteractive = 0;    noninteractive = 0;
1036    if (argmatch (argv, argc, "-batch", "--batch", 5, NULL, &skip_args))    if (argmatch (argv, argc, "-batch", "--batch", 5, NULL, &skip_args))
1037      noninteractive = 1;      noninteractive = 1;
1038      if (argmatch (argv, argc, "-script", "--script", 3, &junk, &skip_args))
1039        {
1040          noninteractive = 1;       /* Set batch mode.  */
1041          /* Convert --script to -l, un-skip it, and sort again so that -l will be
1042             handled in proper sequence.  */
1043          argv[skip_args - 1] = "-l";
1044          skip_args -= 2;
1045          sort_args (argc, argv);
1046        }
1047    
1048    /* Handle the --help option, which gives a usage message.  */    /* Handle the --help option, which gives a usage message.  */
1049    if (argmatch (argv, argc, "-help", "--help", 3, NULL, &skip_args))    if (argmatch (argv, argc, "-help", "--help", 3, NULL, &skip_args))
# Line 1658  struct standard_args standard_args[] = Line 1669  struct standard_args standard_args[] =
1669    { "-nw", "--no-window-system", 110, 0 },    { "-nw", "--no-window-system", 110, 0 },
1670    { "-nw", "--no-windows", 110, 0 },    { "-nw", "--no-windows", 110, 0 },
1671    { "-batch", "--batch", 100, 0 },    { "-batch", "--batch", 100, 0 },
1672      { "-script", "--script", 100, 1 },
1673    { "-help", "--help", 90, 0 },    { "-help", "--help", 90, 0 },
1674    { "-no-unibyte", "--no-unibyte", 83, 0 },    { "-no-unibyte", "--no-unibyte", 83, 0 },
1675    { "-multibyte", "--multibyte", 82, 0 },    { "-multibyte", "--multibyte", 82, 0 },

Legend:
Removed from v.1.317  
changed lines
  Added in v.1.318

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