From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 3 Nov 2006 01:34:35 +0000 (+0000)
Subject: sort commits, and use .git-commits-done file.
X-Git-Tag: release/2.10.0-2~34^2~6^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bd2db986b410591905f89552af5df579dfc1b9fc;p=lilypond.git

sort commits, and use .git-commits-done file.
---

diff --git a/ChangeLog b/ChangeLog
index fdde79a462..566b1f8227 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-11-03  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+	* *: The Joy of Merging.
+
 	* buildscripts/git-update-changelog.py: 
 	sort commits, and use .git-commits-done file.
 
diff --git a/lily/include/program-option.hh b/lily/include/program-option.hh
index 7a119b46e5..55971a1fa1 100644
--- a/lily/include/program-option.hh
+++ b/lily/include/program-option.hh
@@ -22,6 +22,4 @@ SCM ly_set_option (SCM, SCM);
 
 bool get_program_option (const char *);
 
-bool get_program_option (const char *);
-
 #endif /* SCM_OPTION_HH */
diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index ac468b771e..a339e8a8f5 100644
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -163,9 +163,8 @@ Lily_parser::clear ()
     {
       while (lexer_->has_scope ())
 	lexer_->remove_scope ();
-
-      
     }
+
   lexer_ = 0;  
 }
 
diff --git a/lily/program-option.cc b/lily/program-option.cc
index 04f8292a74..be81de380b 100644
--- a/lily/program-option.cc
+++ b/lily/program-option.cc
@@ -211,9 +211,6 @@ LY_DEFINE (ly_command_line_verbose_p, "ly:command-line-verbose?", 0, 0, 0, (),
 
 
 
-
-
-
 LY_DEFINE (ly_get_option, "ly:get-option", 1, 0, 0, (SCM var),
 	   "Get a global option setting.")
 {
@@ -223,15 +220,6 @@ LY_DEFINE (ly_get_option, "ly:get-option", 1, 0, 0, (SCM var),
 }
 
 
-bool
-get_program_option (const char *s)
-{
-  SCM sym = ly_symbol2scm (s);
-
-  return to_boolean (ly_get_option (sym));
-}
-
-
 bool
 get_program_option (const char *s)
 {
diff --git a/lily/tie-configuration.cc b/lily/tie-configuration.cc
index 27f44691dd..2e15eb72eb 100644
--- a/lily/tie-configuration.cc
+++ b/lily/tie-configuration.cc
@@ -80,12 +80,6 @@ Tie_configuration::column_span_length () const
   return column_ranks_[RIGHT] - column_ranks_[LEFT];
 }
 
-int
-Tie_configuration::column_span_length () const
-{
-  return column_ranks_[RIGHT] - column_ranks_[LEFT];
-}
-
 Real
 Tie_configuration::distance (Tie_configuration const &a,
 			     Tie_configuration const &b)
diff --git a/scm/lily.scm b/scm/lily.scm
index 8de8adc430..2c47415ff0 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -25,7 +25,7 @@
 	      (debug-gc-assert-parsed-dead #f
 			"for memory debugging: ensure that all refs to parsed objects are dead.")
 	      
-	      (debug-midi #f "generate human readable MIDI")
+	      (debug-parser #f "debug the bison parser")
 	      (debug-lexer #f "debug the flex lexer")
 	      (debug-midi #f "generate human readable MIDI")
 	      (delete-intermediate-files #f