From: fred <fred>
Date: Tue, 26 Mar 2002 23:23:42 +0000 (+0000)
Subject: lilypond-1.3.64
X-Git-Tag: release/1.5.59~1539
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=eb4bd5dab12fdff2586ea8a98b5c145aa7240457;p=lilypond.git

lilypond-1.3.64
---

diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc
index b84406fa15..e9e530f2e8 100644
--- a/lily/score-engraver.cc
+++ b/lily/score-engraver.cc
@@ -181,12 +181,8 @@ Score_engraver::set_columns (Paper_column *new_command_l,
     {
       if (*current[i])
 	{
-	  if ((*current[i])->used_b())
-
-	    {
 	      scoreline_l_->add_column ((*current[i]));
-	    }
-	  else
+	  if (!(*current[i])->used_b())
 	    {
 	      /*
 		We're forgetting about this column. Dump it, and make SCM
@@ -197,7 +193,7 @@ Score_engraver::set_columns (Paper_column *new_command_l,
 		even prevent this.
 
 	      */
-	      scm_unprotect_object ((*current[i])->self_scm_);
+		(*current[i])->suicide ();
 	      *current[i]  =0;
 	    }
 	}