X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fparser.yy;h=35d858c46f6dbef1c383c3588bc7dba697fc914b;hb=2995e34f3b82324be31383ee6b692badb8cdb9f6;hp=83e95491c292f82fb79d4a3439c0947806d86bc5;hpb=753d6200e9ae51f0a98186478beff2d00d63a62b;p=lilypond.git

diff --git a/lily/parser.yy b/lily/parser.yy
index 83e95491c2..35d858c46f 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -1614,7 +1614,7 @@ basic_music:
 	}
 	| LYRICSTO symbol '=' simple_string lyric_mode_music
 	{
-		$$ = MAKE_SYNTAX (lyric_combine, @$, $3, $2, $4);
+		$$ = MAKE_SYNTAX (lyric_combine, @$, $4, $2, $5);
 	}
 	;
 
@@ -2719,8 +2719,8 @@ context_mod:
 	| context_def_mod embedded_scm
 	{
 		if (!scm_is_string ($2)
-		    && ly_symbol2scm ("consists") != $1
-		    && ly_symbol2scm ("remove") != $1)
+		    && !scm_is_eq ($1, ly_symbol2scm ("consists"))
+		    && !scm_is_eq ($1, ly_symbol2scm ("remove")))
 		{
 			$$ = SCM_EOL;
 			parser->parser_error (@1, _ ("only \\consists and \\remove take non-string argument."));