X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext.cc;h=3c982751fd6635e1822ad525a54471a2fb893a07;hb=c8f35b49edadbef240fe3ad4931a6c9f526cc6d6;hp=15bd3c5fb84a0a8c03deae29d0a9119fe8bf3a05;hpb=9c62c7293a657743e212d8ab279b5d100a9c75a3;p=lilypond.git

diff --git a/lily/context.cc b/lily/context.cc
index 15bd3c5fb8..3c982751fd 100644
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -460,19 +460,16 @@ Context::add_alias (SCM sym)
   aliases_ = scm_cons (sym, aliases_);
 }
 
+/* we don't (yet) instrument context properties */
 void
-Context::internal_set_property (SCM sym, SCM val
-#ifndef NDEBUG
-				, char const *file, int line, char const *fun
-#endif
-				)
+Context::instrumented_set_property (SCM sym, SCM val, const char*, int, const char*)
 {
-#ifndef NDEBUG
-  (void) file;
-  (void) line;
-  (void) fun;
-#endif
+  internal_set_property (sym, val);
+}
 
+void
+Context::internal_set_property (SCM sym, SCM val)
+{
   if (do_internal_type_checking_global)
     assert (type_check_assignment (sym, val, ly_symbol2scm ("translation-type?")));
 
@@ -720,7 +717,7 @@ melisma_busy (Context *tr)
   SCM melisma_properties = tr->get_property ("melismaBusyProperties");
   bool busy = false;
 
-  for (; scm_is_pair (melisma_properties);
+  for (; !busy && scm_is_pair (melisma_properties);
        melisma_properties = scm_cdr (melisma_properties))
     busy = busy || to_boolean (tr->internal_get_property (scm_car (melisma_properties)));