catch guile errors during startup

diff --git a/src/keyboard.c b/src/keyboard.c
index d099e91..7e63357 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1201,11 +1201,20 @@ command_loop_2 (Lisp_Object ignore)
 }
 
 static Lisp_Object
-top_level_2 (void)
+top_level_2_body (void *ignore)
 {
   return Feval (Vtop_level, Qnil);
 }
 
+static Lisp_Object
+top_level_2 (void)
+{
+  return scm_c_with_throw_handler (SCM_BOOL_T,
+                                   top_level_2_body, NULL,
+                                   command_loop_2_handler, NULL,
+                                   0);
+}
+
 static Lisp_Object
 top_level_1 (Lisp_Object ignore)
 {