Merge branch 'cvs-head' of ssh+git://hanwen@repo.or.cz/srv/git/lilypond into master...

[lilypond.git] / lily / object-key.cc

diff --git a/lily/object-key.cc b/lily/object-key.cc
index 4334e4f44b57d52e2224220f6042dd7a4668617d..50e42027efd8ddea4048c23b5c1c113ef9885a7d 100644 (file)
--- a/lily/object-key.cc
+++ b/lily/object-key.cc
@@ -155,7 +155,9 @@ Copied_key::derived_mark () const
 SCM
 Copied_key::as_scheme () const
 {
-  return scm_list_2 (original_ ? original_->self_scm () : SCM_BOOL_F, scm_from_int (copy_count_));
+  return scm_list_2 (original_
+                    ? original_->self_scm ()
+                    : SCM_BOOL_F, scm_from_int (copy_count_));
 }
 
 Object_key *
@@ -164,3 +166,4 @@ Copied_key::from_scheme (SCM a)
   return new Copied_key (unsmob_key (scm_car (a)),
                         scm_to_int (scm_list_ref (a, scm_from_int (1))));
 }
+