From: David Kastrup <dak@gnu.org>
Date: Sun, 5 Feb 2017 16:09:53 +0000 (+0100)
Subject: Issue 5056/3: Don't overcheck arguments to \remove
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=558058bfa3c985ecfec6615fe087a8076f1914fc;p=lilypond.git

Issue 5056/3: Don't overcheck arguments to \remove

Instead we delete engravers with delq! in order to be fast and reliable.
---

diff --git a/lily/context-def.cc b/lily/context-def.cc
index 5768ee5471..72ddf6d37b 100644
--- a/lily/context-def.cc
+++ b/lily/context-def.cc
@@ -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_creator (arg)))
-        l1 = scm_delete_x (arg, l1);
+      else if (scm_is_eq (tag, ly_symbol2scm ("remove")))
+        l1 = scm_delq_x (arg, l1);
     }
 
   return l1;