From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 27 Jan 2006 20:13:48 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.7.30~14
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=86be8e37ac9e39646e5ed2bb2607eabb505322b2;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index 61637154c5..a92df34669 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-27  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* lily/main.cc (main): Debugging aid: catch exceptions.
+
+	* flower/std-string.cc (to_string): Robustication.  Fixes midi
+	output with std::string.
+
 2006-01-27  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* Documentation/topdocs/INSTALL.texi (Top): remove libkpathsea notes.
diff --git a/flower/std-string.cc b/flower/std-string.cc
index 7798da3c83..4644ae3e92 100644
--- a/flower/std-string.cc
+++ b/flower/std-string.cc
@@ -20,7 +20,7 @@ namespace std {
   std::string
   to_string (char c, int n)
   {
-    return std::string (n, c);
+    return std::string (max (n, 0), c);
   }
 
   std::string
diff --git a/lily/main.cc b/lily/main.cc
index 3ea52240a6..a99bd7908b 100644
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -616,7 +616,16 @@ main (int argc, char **argv)
 
   setup_paths (argv[0]);
   setup_guile_env ();
-  scm_boot_guile (argc, argv, main_with_guile, 0);
+
+  /* Debugging aid.  */
+  try
+    {
+      scm_boot_guile (argc, argv, main_with_guile, 0);
+    }
+  catch (exception e)
+    {
+      error (_f ("exception caught: %s", e.what ()));
+    };
 
   /* Only reachable if GUILE exits.  That is an error.  */
   return 1;