guile/guile-core/libguile init.c

[Marius Vollmer]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Marius Vollmer <address@hidden> 00/10/19 17:31:29

Modified files:
        guile-core/libguile: init.c 

Log message:
        * init.c (scm_init_guile_1, invoke_main_func): Call
        scm_load_startup_files in scm_init_guile_1, not in
        invoke_main_func.

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/init.c.diff?r1=1.102&r2=1.103

Patches:
Index: guile/guile-core/libguile/init.c
diff -u guile/guile-core/libguile/init.c:1.102 
guile/guile-core/libguile/init.c:1.103
--- guile/guile-core/libguile/init.c:1.102      Wed Oct 11 12:22:06 2000
+++ guile/guile-core/libguile/init.c    Thu Oct 19 17:31:29 2000
@@ -594,6 +594,7 @@
   scm_stack_checking_enabled_p = SCM_STACK_CHECKING_P;
 #endif
 
+  scm_load_startup_files ();
 }
 
 /* Record here whether SCM_BOOT_GUILE_1 has already been called.  This
@@ -634,8 +635,6 @@
 invoke_main_func (void *body_data)
 {
   struct main_func_closure *closure = (struct main_func_closure *) body_data;
-
-  scm_load_startup_files ();
 
   (*closure->main_func) (closure->closure, closure->argc, closure->argv);