From: Joe Neeman <joeneeman@gmail.com> Date: Sun, 4 Feb 2007 09:22:35 +0000 (+0200) Subject: Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman X-Git-Tag: release/2.11.16-1^2~1 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a3765e1d290e5e49093e7ca7791bf3fe20be1726;p=lilypond.git Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman Conflicts: lily/grob-property.cc --- a3765e1d290e5e49093e7ca7791bf3fe20be1726 diff --cc lily/grob-property.cc index f89d42194d,e7b59d954d..084ea42fbd --- a/lily/grob-property.cc +++ b/lily/grob-property.cc @@@ -70,22 -84,8 +70,21 @@@ Grob::instrumented_set_property (SCM sy scm_from_int (line), scm_from_locale_string (fun), sym, v, SCM_UNDEFINED)); + internal_set_property (sym, v); } -#else +#endif + +SCM +Grob::get_property_alist_chain (SCM def) const +{ + return scm_list_n (mutable_property_alist_, + immutable_property_alist_, + def, + SCM_UNDEFINED); +} + - +extern void check_interfaces_for_property (Grob const *me, SCM sym); + void Grob::internal_set_property (SCM sym, SCM v) {