From: Joe Neeman <joeneeman@gmail.com>
Date: Sat, 19 Apr 2008 23:13:34 +0000 (+1000)
Subject: Merge commit 'origin'
X-Git-Tag: release/2.11.45-1~33^2~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e67f89f260bd50c1cf1cc6799b8203cf240350c7;hp=61ef28fa5e863a436b3402bb308a5df3d2e7ad78;p=lilypond.git

Merge commit 'origin'
---

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 2f61d53f3f..655d992123 100644
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -188,7 +188,7 @@ Stencil
 Font_metric::text_stencil (string str) const
 {
   (void) str;
-  assert (false);
+  programming_error("Cannot get a text stencil from this font");
   return Stencil (Box (), SCM_EOL);
 }
 
diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index 2265e249c2..3028817998 100644
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -101,7 +101,7 @@ inline bool ly_is_equal (SCM x, SCM y)
 }
 
 inline bool ly_scm2bool (SCM x) { return SCM_NFALSEP (x); }
-inline char ly_scm2char (SCM x) { return SCM_CHAR (x); }
+inline char ly_scm2char (SCM x) { return (char)SCM_CHAR (x); }
 inline SCM ly_bool2scm (bool x) { return SCM_BOOL (x); }
 
 inline SCM ly_append2 (SCM x1, SCM x2)