From: Don Armstrong <don@donarmstrong.com>
Date: Sun, 13 May 2012 23:07:46 +0000 (-0700)
Subject: Fix redefinition of s in Music_sequence::first_start. (Closes #672087).
X-Git-Tag: debian/2.16.0-1_exp+1~45
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1bc26969fe372d9e257d91f0ef6e1ca0f9999ed6;hp=8e9a5b11d622d7d2a861d880d5ae667fa04bc506;p=lilypond.git

Fix redefinition of s in Music_sequence::first_start. (Closes #672087).
---

diff --git a/debian/changelog b/debian/changelog
index a4bbb2f1c1..f2cb168998 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lilypond (2.14.2-3) unstable; urgency=low
+
+  * Fix redefinition of s in Music_sequence::first_start. (Closes
+    #672087).
+
+ -- Don Armstrong <don@debian.org>  Sun, 13 May 2012 16:07:16 -0700
+
 lilypond (2.14.2-2) unstable; urgency=low
 
   * Disable optimization on i386 and kfreebsd-i386 to avoid segfaults with
diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index 8c9642c860..42bfd8719f 100644
--- a/lily/music-sequence.cc
+++ b/lily/music-sequence.cc
@@ -148,10 +148,10 @@ Music_sequence::first_start (SCM l)
   for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
     {
       Music *mus = unsmob_music (scm_car (s));
-      Moment l = mus->get_length ();
-      Moment s = mus->start_mom ();
-      if (l.to_bool () || s.to_bool ())
-	return s;
+      Moment lt = mus->get_length ();
+      Moment st = mus->start_mom ();
+      if (lt.to_bool () || st.to_bool ())
+	return st;
     }
   return m;
 }