patch::: 1.3.85.jcn1

diff --git a/VERSION b/VERSION
index 90149d788b43e390e0fdc5371c1c9dc00b530e12..7ed1603d183b1da90b0516f1822564188d4b106b 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=85
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index 02eb4c7fb95e42b23b417e6f3133e2330ae61890..dc1b92025a894ecdba9ee986d3ce2dcac5811ad4 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -115,7 +115,7 @@ Translator_group::find_create_translator_l (String n, String id)
     return existing;
 
   Link_array<Translator_def> path
-    = unsmob_translator_def (definition_)->path_to_acceptable_translator (gh_str02scm (n.ch_C()), output_def_l ());
+    = unsmob_translator_def (definition_)->path_to_acceptable_translator (ly_str02scm ((char*)n.ch_C()), output_def_l ());
 
   if (path.size ())
     {