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

diff --git a/ChangeLog b/ChangeLog
index fdde79a4627cbc14b7427730e2d454853a1301ac..566b1f8227b86851a9ba80c019a00b1b8fe0d233 100644 (file)
--- 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 7a119b46e5a7063db8f7e8e13f49d9e95d2e649f..55971a1fa16ba6a74e451ad6e5ed81cc0bd36783 100644 (file)
--- 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 ac468b771e74c53606ebfc98871fcdef32b8a773..a339e8a8f5d7c6585b98c3ef034a28b43224a1dc 100644 (file)
--- 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 04f8292a744eda151e19d2cabfa2bed6682d76ae..be81de380bf49ec1d5fea180d445db17d7be7d49 100644 (file)
--- 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 27f44691dd1ba3a27ffbff8f8726c5963936b71e..2e15eb72ebe6d21fbfa9fd3459c5cb7a53f02ee9 100644 (file)
--- 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 8de8adc4308e172281e461223696b83c53b21fc8..2c47415ff0adb278e33d6daf32c4495ef7eef33e 100644 (file)
--- 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