*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 61637154c5e0d134225869a8f5350df2dca0b69f..a92df34669fed22b1db8e0bcb7e35b9806993449 100644 (file)
--- 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 7798da3c838fab88df23e144f4a2ed28eb06e61e..4644ae3e9267de08f7cfcf12533d27c1a8831957 100644 (file)
--- 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 3ea52240a6413be49418359bb6c7c6f7fb9cb5d3..a99bd7908bdce91b9b4ed9b8972101ebc36f6477 100644 (file)
--- 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;