From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 2 Nov 2005 01:24:25 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.7.15~14
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7bd94ae712e871613a39092e275005a73c11a27c;hp=f01b62400572ea7fe1b4f7511a2b3a33d8e42cdb;p=lilypond.git

*** empty log message ***
---

diff --git a/lily/context-property.cc b/lily/context-property.cc
index 45dccdc05c..68f8f5035e 100644
--- a/lily/context-property.cc
+++ b/lily/context-property.cc
@@ -14,6 +14,7 @@
 #include "spanner.hh"
 #include "warn.hh"
 #include "paper-column.hh"
+#include "simple-closure.hh"
 
 SCM
 lookup_nested_property (SCM alist,
@@ -137,7 +138,7 @@ execute_general_pushpop_property (Context *context,
       if (!scm_is_pair (scm_cdr (grob_property_path)))
 	{
 	  if (!ly_is_procedure (new_value)
-	      && !is_callback_chain (new_value))
+	      && !is_simple_closure (new_value))
 	    ok = type_check_assignment (symbol, new_value,
 					ly_symbol2scm ("backend-type?"));
 
diff --git a/lily/grob-property.cc b/lily/grob-property.cc
index 5d4d03fe34..38306c536b 100644
--- a/lily/grob-property.cc
+++ b/lily/grob-property.cc
@@ -102,7 +102,6 @@ Grob::internal_get_property (SCM sym) const
 {
   SCM val = get_property_data (sym);
   if (ly_is_procedure (val)
-      || is_callback_chain (val)
       || is_simple_closure (val))
     {
       val = ((Grob*)this)->try_callback (sym, val);