Merge with master

[lilypond.git] / lily / clef.cc

diff --git a/lily/clef.cc b/lily/clef.cc
index 36427055f525f4522af68132732fba502de4edc5..90b5480087bfa0433de2f57270518b7d17a48e42 100644 (file)
--- a/lily/clef.cc
+++ b/lily/clef.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "clef.hh"
@@ -31,7 +31,7 @@ Clef::calc_glyph_name (SCM smob)
          str += "_change";
        }
 
-      return scm_makfrom0str (str.c_str ());
+      return ly_string2scm (str);
     }
 
   s->suicide ();