From: fred <fred>
Date: Sun, 24 Mar 2002 19:38:04 +0000 (+0000)
Subject: lilypond-0.0.47
X-Git-Tag: release/1.5.59~5028
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=69f12b84b6fd29a0d99cd75f359f5750c849f95c;p=lilypond.git

lilypond-0.0.47
---

diff --git a/lily/lexer.l b/lily/lexer.l
index 560b49da11..9ecc6f9e4d 100644
--- 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 876a0ecf01..308a7ac432 100644
--- 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);