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

diff --git a/debian/changelog b/debian/changelog
index a4bbb2f1c11aeb67dc158d2ae3efbc6349497640..f2cb16899804721d9bc116b7896cd2afb1e25504 100644 (file)
--- 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 8c9642c8608568b11030f5c9ade4284c0c615736..42bfd8719f718ef86be08cc1cfbf269ed7bf6132 100644 (file)
--- 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;
 }