Commit 8b4eb796 authored by Ken Raeburn's avatar Ken Raeburn

* emacs.c (main): Initialize initial-environment and process-environment

before generating from env, not after.
parent e45b9e19
2010-05-15 Ken Raeburn <raeburn@raeburn.org> 2010-05-15 Ken Raeburn <raeburn@raeburn.org>
* emacs.c (main): Initialize initial-environment and
process-environment before generating from env, not after.
Handle --version reasonably in CANNOT_DUMP configuration. Handle --version reasonably in CANNOT_DUMP configuration.
* emacs.c (emacs_version, emacs_copyright): New string variables. * emacs.c (emacs_version, emacs_copyright): New string variables.
(Vemacs_version, Vemacs_copyright): New Lisp_Object variables. (Vemacs_version, Vemacs_copyright): New Lisp_Object variables.
......
...@@ -1543,6 +1543,11 @@ main (int argc, char **argv) ...@@ -1543,6 +1543,11 @@ main (int argc, char **argv)
ns_init_paths (); ns_init_paths ();
#endif #endif
/* Initialize and GC-protect Vinitial_environment and
Vprocess_environment before set_initial_environment fills them
in. */
if (!initialized)
syms_of_callproc ();
/* egetenv is a pretty low-level facility, which may get called in /* egetenv is a pretty low-level facility, which may get called in
many circumstances; it seems flimsy to put off initializing it many circumstances; it seems flimsy to put off initializing it
until calling init_callproc. */ until calling init_callproc. */
...@@ -1592,7 +1597,6 @@ main (int argc, char **argv) ...@@ -1592,7 +1597,6 @@ main (int argc, char **argv)
syms_of_callint (); syms_of_callint ();
syms_of_casefiddle (); syms_of_casefiddle ();
syms_of_casetab (); syms_of_casetab ();
syms_of_callproc ();
syms_of_category (); syms_of_category ();
syms_of_ccl (); syms_of_ccl ();
syms_of_character (); syms_of_character ();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment