From: Ken Raeburn <raeburn@raeburn.org>
Date: Sat, 15 May 2010 21:16:20 +0000 (-0400)
Subject: * emacs.c (main): Initialize initial-environment and process-environment
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~208^2~44
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8b4eb7969cefe32154d719ac7c3137b1e43b72f9;p=emacs.git

* emacs.c (main): Initialize initial-environment and process-environment
before generating from env, not after.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 31084286ddb..32761b6f446 100644
--- 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 36db274adf6..c0ef926da75 100644
--- 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 ();