summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2010-07-10 10:21:22 +0200
committerAndy Wingo <wingo@pobox.com>2010-07-10 10:21:22 +0200
commita85f90f5ac5c3c5f830e295c0ca7b006141b1a83 (patch)
tree28952ed1cd36a26d726c0504ebae3887cca79585
parentd26a26f6c0fbdb971995d1b3dcf3345831eb12d7 (diff)
downloadguile-a85f90f5ac5c3c5f830e295c0ca7b006141b1a83.tar.gz
capture default dynamic state in (guile-user)
* libguile/init.c (scm_i_init_guile): Move the call to scm_init_threads_default_dynamic_state after the call to scm_load_startup_files, so that the default dynamic state is in the (guile-user) module, not (guile).
-rw-r--r--libguile/init.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libguile/init.c b/libguile/init.c
index 6313b6544..4843910aa 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -570,8 +570,6 @@ scm_i_init_guile (SCM_STACKITEM *base)
scm_i_init_deprecated ();
#endif
- scm_init_threads_default_dynamic_state ();
-
scm_initialized_p = 1;
#ifdef STACK_CHECKING
@@ -585,6 +583,10 @@ scm_i_init_guile (SCM_STACKITEM *base)
atexit (cleanup_for_exit);
scm_load_startup_files ();
scm_init_load_should_autocompile ();
+
+ /* Capture the dynamic state after loading boot-9, so that new threads end up
+ in the guile-user module. */
+ scm_init_threads_default_dynamic_state ();
}
/*