X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext-def.cc;h=72ddf6d37b32e816b0bf585a2fede4f41b429915;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=7e391740a6d2f4327df101a85f6b4df513e2c76f;hpb=958e95822083954cad00e0a598eb9f12ceba67b9;p=lilypond.git

diff --git a/lily/context-def.cc b/lily/context-def.cc
index 7e391740a6..72ddf6d37b 100644
--- a/lily/context-def.cc
+++ b/lily/context-def.cc
@@ -82,10 +82,10 @@ Context_def::~Context_def ()
 {
 }
 
-const char Context_def::type_p_name_[] = "ly:context-def?";
+const char * const Context_def::type_p_name_ = "ly:context-def?";
 
 int
-Context_def::print_smob (SCM port, scm_print_state *)
+Context_def::print_smob (SCM port, scm_print_state *) const
 {
   scm_puts ("#<Context_def ", port);
   scm_display (context_name_, port);
@@ -97,7 +97,7 @@ Context_def::print_smob (SCM port, scm_print_state *)
 }
 
 SCM
-Context_def::mark_smob ()
+Context_def::mark_smob () const
 {
   ASSERT_LIVE_IS_ALLOWED (self_scm ());
 
@@ -291,11 +291,8 @@ Context_def::get_translator_names (SCM user_mod) const
 
       if (scm_is_eq (tag, ly_symbol2scm ("consists")))
         l1 = scm_cons (arg, l1);
-      else if (scm_is_eq (tag, ly_symbol2scm ("remove"))
-               && (scm_is_pair (arg)
-                   || ly_is_procedure (arg)
-                   || get_translator (arg)))
-        l1 = scm_delete_x (arg, l1);
+      else if (scm_is_eq (tag, ly_symbol2scm ("remove")))
+        l1 = scm_delq_x (arg, l1);
     }
 
   return l1;