Mercurial > hg > xemacs-beta
comparison src/emacs.c @ 80:1ce6082ce73f r20-0b90
Import from CVS: tag r20-0b90
author | cvs |
---|---|
date | Mon, 13 Aug 2007 09:06:37 +0200 |
parents | c7528f8e288d |
children | 1040fe1366ac |
comparison
equal
deleted
inserted
replaced
79:5b0a5bbffab6 | 80:1ce6082ce73f |
---|---|
1431 load_me = Qnil; | 1431 load_me = Qnil; |
1432 if (!initialized) | 1432 if (!initialized) |
1433 { | 1433 { |
1434 /* Handle -l loadup-and-dump, args passed by Makefile. */ | 1434 /* Handle -l loadup-and-dump, args passed by Makefile. */ |
1435 if (argc > 2 + skip_args && !strcmp (argv[1 + skip_args], "-l")) | 1435 if (argc > 2 + skip_args && !strcmp (argv[1 + skip_args], "-l")) |
1436 load_me = build_string (argv[2 + skip_args]); | 1436 load_me = build_string (argv[2 + skip_args]); |
1437 #ifdef CANNOT_DUMP | 1437 #ifdef CANNOT_DUMP |
1438 /* Unless next switch is -nl, load "loadup.el" first thing. */ | 1438 /* Unless next switch is -nl, load "loadup.el" first thing. */ |
1439 if (!(argc > 1 + skip_args && !strcmp (argv[1 + skip_args], "-nl"))) | 1439 if (!(argc > 1 + skip_args && !strcmp (argv[1 + skip_args], "-nl"))) |
1440 load_me = build_string ("loadup.el"); | 1440 load_me = build_string ("loadup.el"); |
1441 #endif /* CANNOT_DUMP */ | 1441 #endif /* CANNOT_DUMP */ |
1794 extern char *_environ; | 1794 extern char *_environ; |
1795 if ((unsigned) environ == 0) | 1795 if ((unsigned) environ == 0) |
1796 environ=_environ; | 1796 environ=_environ; |
1797 } | 1797 } |
1798 #endif /* _SCO_DS */ | 1798 #endif /* _SCO_DS */ |
1799 vol_envp = environ; | 1799 vol_envp = environ; |
1800 } | 1800 } |
1801 run_temacs_argc = -1; | 1801 run_temacs_argc = -1; |
1802 | 1802 |
1803 main_1 (vol_argc, vol_argv, vol_envp); | 1803 main_1 (vol_argc, vol_argv, vol_envp); |
1804 } | 1804 } |
1805 | 1805 |