X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;fp=lily%2Flexer.ll;h=7b395b3b25f1813e6a5044b39ab63f899ca46bd5;hb=fd8e4f4ad347ef8f96c2e069be83f63f0f9da466;hp=21d2fc1acc16bc32cd224c1e0013fcf93151db4f;hpb=2fef7b7eb7ac5d7a2ed237bf22a6ec6fe5d946d9;p=lilypond.git

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 21d2fc1acc..7b395b3b25 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -231,8 +231,10 @@ BOM_UTF8	\357\273\277
 
 	yy_pop_state ();
 
-	SCM top_scope = scm_car (scm_last_pair (scopes_));
-	scm_module_define (top_scope, ly_symbol2scm ("version-seen"), SCM_BOOL_T);
+	if (is_main_input_ && include_stack_.size () == main_input_level_) {
+		SCM top_scope = scm_car (scm_last_pair (scopes_));
+		scm_module_define (top_scope, ly_symbol2scm ("version-seen"), SCM_BOOL_T);
+	}
 
 	if (!is_valid_version (s)) {
                 yylval = SCM_UNSPECIFIED;
@@ -424,8 +426,7 @@ BOM_UTF8	\357\273\277
 		{
 			yylval = sval;
 			int token = MARKUP_FUNCTION;
-			if (scm_is_true (scm_object_property
-					 (sval, ly_symbol2scm ("markup-list-command"))))
+			if (scm_is_true (Lily::markup_list_function_p (sval)))
 				token = MARKUP_LIST_FUNCTION;
 			push_markup_predicates (sig);
 			return token;