release: 1.3.120

[lilypond.git] / lily / property-engraver.cc

diff --git a/lily/property-engraver.cc b/lily/property-engraver.cc
index 79227b559077953d5fb6a117fa52297612f23eeb..4ece8f391927ecc1ceb4b71c40fad3eedd5d9584 100644 (file)
--- a/lily/property-engraver.cc
+++ b/lily/property-engraver.cc
@@ -116,18 +116,14 @@ Property_engraver::apply_properties (SCM p, Grob *e, Translator_group*origin)
        {
          e->set_grob_property (elt_prop_sym, val);
 
-         SCM errport = scm_current_error_port ();
          SCM meta = e->get_grob_property ("meta");
          SCM name = scm_assoc (ly_symbol2scm ("name"), meta);
-         /* warning () ? */
-         scm_puts (_f ("%s is deprecated.  Use\n \\property %s.%s \\override #'%s = #%s",
-                       ly_symbol2string (prop_sym).ch_C (),
-                       origin->type_str_.ch_C (),
-                       ly_scm2string (gh_cdr (name)).ch_C (),
-                       ly_symbol2string (elt_prop_sym).ch_C (),
-                       ly_scm2string (ly_write2scm (val)).ch_C ()).ch_C (),
-                   errport);
-         scm_puts ("\n", errport);
+         warning (_f ("%s is deprecated.  Use\n \\property %s.%s \\override #'%s = #%s",
+                      ly_symbol2string (prop_sym).ch_C (),
+                      origin->type_str_.ch_C (),
+                      ly_scm2string (gh_cdr (name)).ch_C (),
+                      ly_symbol2string (elt_prop_sym).ch_C (),
+                      ly_scm2string (ly_write2scm (val)).ch_C ()));
        }
       else
 
@@ -148,7 +144,7 @@ Property_engraver::apply_properties (SCM p, Grob *e, Translator_group*origin)
            SCM type_name = gh_call1 (typefunc, type_p);
            warning (_f ("Wrong type for property: %s, type: %s, value found: %s, type: %s",
                         ly_symbol2string (prop_sym).ch_C (),
-                        ly_symbol2string (type_name).ch_C (),
+                        ly_scm2string (type_name).ch_C (),
                         ly_scm2string (ly_write2scm (val)).ch_C (),
                         ly_scm2string (ly_type (val)).ch_C ()));
            scm_puts ("\n", errport);