more robust srcdir check

[lilypond.git] / lily / axis-group-interface.cc

diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index 1d509f04d1923b436c0f4866d2767e2b085fea32..02e900164b642b1ba8f358994b7e9884edafa696 100644 (file)
--- a/lily/axis-group-interface.cc
+++ b/lily/axis-group-interface.cc
@@ -27,17 +27,17 @@ Axis_group_interface::add_element (Grob *me, Grob *e)
   if (!scm_is_pair (axes))
     programming_error ("axes should be nonempty");
 
-  for (SCM ax = axes; ax != SCM_EOL; ax = scm_cdr (ax))
+  for (SCM ax = axes; scm_is_pair (ax); ax = scm_cdr (ax))
     {
       Axis a = (Axis) scm_to_int (scm_car (ax));
 
       if (!e->get_parent (a))
        e->set_parent (me, a);
 
-      e->internal_set_object ((a == X_AXIS)
-                             ? ly_symbol2scm ("axis-group-parent-X")
-                             : ly_symbol2scm ("axis-group-parent-Y"),
-                             me->self_scm ());
+      e->set_object ((a == X_AXIS)
+                    ? ly_symbol2scm ("axis-group-parent-X")
+                    : ly_symbol2scm ("axis-group-parent-Y"),
+                    me->self_scm ());
     }
 
   /* must be ordered, because Align_interface also uses