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

before generating from env, not after.

diff --git a/src/ChangeLog b/src/ChangeLog
index 31084286ddb2b7fec6d4bdf3bbfa044204e6232e..32761b6f446454132917d7cff6bcbe6c14bf727c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 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.
        * emacs.c (emacs_version, emacs_copyright): New string variables.
        (Vemacs_version, Vemacs_copyright): New Lisp_Object variables.

diff --git a/src/emacs.c b/src/emacs.c
index 36db274adf6de49a711d0595d74efdec9f2d44bc..c0ef926da754179e4324fa254db99c5256e33d6d 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1543,6 +1543,11 @@ main (int argc, char **argv)
     ns_init_paths ();
 #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
      many circumstances; it seems flimsy to put off initializing it
      until calling init_callproc.  */
@@ -1592,7 +1597,6 @@ main (int argc, char **argv)
       syms_of_callint ();
       syms_of_casefiddle ();
       syms_of_casetab ();
-      syms_of_callproc ();
       syms_of_category ();
       syms_of_ccl ();
       syms_of_character ();