release commit

[lilypond.git] / lily / context.cc

diff --git a/lily/context.cc b/lily/context.cc
index 14abd62adf1c16cbc936c7f52b234cafaf33e7d6..6b539519e1629af16abbb30e92071835a17ba6e0 100644 (file)
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -21,14 +21,13 @@ bool
 Context::is_removable () const
 {
   return context_list_ == SCM_EOL && ! iterator_count_ &&
-         !dynamic_cast<Score_context const*> (this)
-    ;
+         !dynamic_cast<Score_context const*> (this);
 }
 
 void
 Context::check_removal ()
 {
-  for (SCM p = context_list_; ly_c_pair_p (p); p = ly_cdr (p))
+  for (SCM p = context_list_; scm_is_pair (p); p = ly_cdr (p))
     {
       Context *trg =  unsmob_context (ly_car (p));
 
@@ -175,7 +174,7 @@ Context::find_create_context (SCM n, String id,
 SCM
 Context::default_child_context_name () const
 {
-  return ly_c_pair_p (accepts_list_)
+  return scm_is_pair (accepts_list_)
     ? ly_car (scm_last_pair (accepts_list_))
     : SCM_EOL;
 }
@@ -245,7 +244,7 @@ bool
 Context::is_alias (SCM sym) const
 {
   if (sym == ly_symbol2scm ("Bottom")
-      && !ly_c_pair_p (accepts_list_))
+      && !scm_is_pair (accepts_list_))
     return true;
   if (sym == unsmob_context_def (definition_)->get_context_name ())
     return true;
@@ -309,7 +308,7 @@ find_context_below (Context * where,
   
   Context * found = 0;
   for (SCM s = where->children_contexts ();
-       !found && ly_c_pair_p (s); s = ly_cdr (s))
+       !found && scm_is_pair (s); s = ly_cdr (s))
     {
       Context * tr = unsmob_context (ly_car (s));