New upstream version 2.19.80

[lilypond.git] / lily / lexer.ll

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 21d2fc1acc16bc32cd224c1e0013fcf93151db4f..7b395b3b25f1813e6a5044b39ab63f899ca46bd5 100644 (file)
--- 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;