/[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.303 by eliz, Fri Mar 22 17:52:16 2002 UTC revision 1.304 by monnier, Fri Mar 22 22:54:19 2002 UTC
# Line 1219  main (argc, argv, envp) Line 1219  main (argc, argv, envp)
1219    
1220    /* Handle --unibyte and the EMACS_UNIBYTE envvar,    /* Handle --unibyte and the EMACS_UNIBYTE envvar,
1221       but not while dumping.  */       but not while dumping.  */
1222    if (    if (1)
 #ifndef CANNOT_DUMP  
       ! noninteractive || initialized  
 #else  
       1  
 #endif  
       )  
1223      {      {
1224        int inhibit_unibyte = 0;        int inhibit_unibyte = 0;
1225    
1226        /* --multibyte overrides EMACS_UNIBYTE.  */        /* --multibyte overrides EMACS_UNIBYTE.  */
1227        if (argmatch (argv, argc, "-no-unibyte", "--no-unibyte", 4, NULL, &skip_args)        if (argmatch (argv, argc, "-no-unibyte", "--no-unibyte", 4, NULL, &skip_args)
1228            || argmatch (argv, argc, "-multibyte", "--multibyte", 4, NULL, &skip_args))            || argmatch (argv, argc, "-multibyte", "--multibyte", 4, NULL, &skip_args)
1229              /* Ignore EMACS_UNIBYTE before dumping.  */
1230              || (!initialized && noninteractive))
1231          inhibit_unibyte = 1;          inhibit_unibyte = 1;
1232    
1233        /* --unibyte requests that we set up to do everything with single-byte        /* --unibyte requests that we set up to do everything with single-byte
# Line 1542  main (argc, argv, envp) Line 1538  main (argc, argv, envp)
1538        if (argmatch (argv, argc, "-l", "--load", 3, &file, &skip_args))        if (argmatch (argv, argc, "-l", "--load", 3, &file, &skip_args))
1539          Vtop_level = Fcons (intern ("load"),          Vtop_level = Fcons (intern ("load"),
1540                              Fcons (build_string (file), Qnil));                              Fcons (build_string (file), Qnil));
 #ifdef CANNOT_DUMP  
1541        /* Unless next switch is -nl, load "loadup.el" first thing.  */        /* Unless next switch is -nl, load "loadup.el" first thing.  */
1542        if (! no_loadup)        if (! no_loadup)
1543          Vtop_level = Fcons (intern ("load"),          Vtop_level = Fcons (intern ("load"),
1544                              Fcons (build_string ("loadup.el"), Qnil));                              Fcons (build_string ("loadup.el"), Qnil));
 #endif /* CANNOT_DUMP */  
1545      }      }
1546    
1547    if (initialized)    if (initialized)
# Line 1643  struct standard_args standard_args[] = Line 1637  struct standard_args standard_args[] =
1637    { "-multibyte", "--multibyte", 82, 0 },    { "-multibyte", "--multibyte", 82, 0 },
1638    { "-unibyte", "--unibyte", 81, 0 },    { "-unibyte", "--unibyte", 81, 0 },
1639    { "-no-multibyte", "--no-multibyte", 80, 0 },    { "-no-multibyte", "--no-multibyte", 80, 0 },
 #ifdef CANNOT_DUMP  
1640    { "-nl", "--no-loadup", 70, 0 },    { "-nl", "--no-loadup", 70, 0 },
 #endif  
1641    /* -d must come last before the options handled in startup.el.  */    /* -d must come last before the options handled in startup.el.  */
1642    { "-d", "--display", 60, 1 },    { "-d", "--display", 60, 1 },
1643    { "-display", 0, 60, 1 },    { "-display", 0, 60, 1 },

Legend:
Removed from v.1.303  
changed lines
  Added in v.1.304

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