lilypond-0.0.47

diff --git a/lily/lexer.l b/lily/lexer.l
index 560b49da11b83544a0905e22da60c47f96abd340..9ecc6f9e4d4d09bb852ad413a2b85ed01f699a7f 100644 (file)
--- a/lily/lexer.l
+++ b/lily/lexer.l
@@ -75,7 +75,6 @@ include           {
        String s (YYText()+1);
        s = s.left_str(s.length_i()-1);
        mtor << "#include `" << s << "\'\n";
-//     defined_ch_C = here_ch_C() - String( YYText() ).length_i() - 1;
        new_input(s,source_l_g);
        yy_pop_state();
 }
@@ -231,7 +230,7 @@ include           {
 }
 
 <*>.           {
-       error( String( "illegal character: " ) + String( YYText()[0] ), here_ch_C() );
+       LexerError( String( "illegal character: " ) +String( YYText()[0] ));
        return YYText()[0];
 }
 

diff --git a/lily/local-key-reg.cc b/lily/local-key-reg.cc
index 876a0ecf01aa5955e99c847c6a27908d612948f6..308a7ac432c6d933b54f888adda7baa7bb611705 100644 (file)
--- a/lily/local-key-reg.cc
+++ b/lily/local-key-reg.cc
@@ -64,7 +64,7 @@ Local_key_register::process_requests()
        if (key_C_)  
            local_key_.reset(*key_C_);
        else if( time_C_->when_ >Moment(0))
-           warning ("Help me! can't figure  current key", (const char*)0);
+           warning ("Help me! can't figure  current key");
     }
 }
 IMPLEMENT_STATIC_NAME(Local_key_register);