* lily/span-bar.cc (print): sort bar line extents. Fixes problem

[lilypond.git] / lily / context.cc

diff --git a/lily/context.cc b/lily/context.cc
index a14b25e8367b3b66fcc34bdec8689c3b2b0919d8..b6ded9ec05e48736b8aacee2115e9a0e4b02c483 100644 (file)
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -221,14 +221,14 @@ Context::create_context (Context_def *cdef,
 {
   String type = ly_symbol2string (cdef->get_context_name ());
   Object_key const *key = get_context_key (type, id);
-  Context *new_group
+  Context *new_context
     = cdef->instantiate (ops, key);
 
-  new_group->id_string_ = id;
-  add_context (new_group);
-  apply_property_operations (new_group, ops);
+  new_context->id_string_ = id;
+  add_context (new_context);
+  apply_property_operations (new_context, ops);
 
-  return new_group;
+  return new_context;
 }
 
 Object_key const *
@@ -276,7 +276,7 @@ SCM
 Context::default_child_context_name () const
 {
   return scm_is_pair (accepts_list_)
-    ? scm_car (scm_last_pair (accepts_list_))
+    ? scm_car (accepts_list_) 
     : SCM_EOL;
 }