From 9f7578b93435cb11ef9a6ebc34155891e52bdaea Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 5 Nov 2006 13:18:37 +0100
Subject: [PATCH] catch all GUILE exceptions

---
 lily/parse-scm.cc | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc
index 0769083cfa..c8d8d36bfa 100644
--- a/lily/parse-scm.cc
+++ b/lily/parse-scm.cc
@@ -94,21 +94,13 @@ parse_handler (void *data, SCM tag, SCM args)
   return SCM_UNDEFINED;
 }
 
-/*
-  Do some magical incantations: if not, lily will exit on the first
-  GUILE error, leaving no location trace.
-*/
-
-#if GUILE_MINOR_VERSION < 7
-#define READ_ERROR "misc-error"
-#else
-#define READ_ERROR "read-error"
-#endif
-
 SCM
 protected_ly_parse_scm (Parse_start *ps)
 {
-  return scm_internal_catch (ly_symbol2scm (READ_ERROR),
+  /*
+    Catch #t : catch all Scheme level errors.
+   */
+  return scm_internal_catch (SCM_BOOL_T, 
 			     &catch_protected_parse_body,
 			     (void *) ps,
 			     &parse_handler, (void *) ps);
-- 
2.39.2