X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fcontext-def.cc;h=31b821655c3074958fd907e97d56a41743c98081;hb=95f21b745890a01ccc85c6ba57710090164b36d2;hp=0b95a8b952e487178621abc61ecd402c23aacecb;hpb=0e5d83a9ceb4a143f83d22406d7eb816314ff9f7;p=lilypond.git

diff --git a/lily/context-def.cc b/lily/context-def.cc
index 0b95a8b952..31b821655c 100644
--- a/lily/context-def.cc
+++ b/lily/context-def.cc
@@ -123,12 +123,11 @@ Context_def::add_context_mod (SCM mod)
   if (ly_symbol2scm ("default-child") == tag)
     default_child_ = sym;
   else if (ly_symbol2scm ("consists") == tag
-	   || ly_symbol2scm ("consists-end") == tag
 	   || ly_symbol2scm ("remove") == tag)
     {
       if (!get_translator (sym))
-	error (_f ("program has no such type: `%s'",
-		   ly_symbol2string (sym).c_str ()));
+	warning (_f ("program has no such type: `%s'",
+		     ly_symbol2string (sym).c_str ()));
       else
 	translator_mods_ = scm_cons (scm_list_2 (tag, sym), translator_mods_);
     }
@@ -286,7 +285,8 @@ Context_def::get_translator_names (SCM user_mod) const
 
       if (ly_symbol2scm ("consists") == tag)
 	l1 = scm_cons (arg, l1);
-      else if (ly_symbol2scm ("remove") == tag)
+      else if (ly_symbol2scm ("remove") == tag
+	       && get_translator (arg))
 	l1 = scm_delete_x (arg, l1);
     }