Issue 2853: Set up indent-tabs-mode for Emacs in lexer.ll and parser.yy

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index e69f9f55175ccf2133824417cc8bb30586292dbd..19c0d90624c52eaa0bcb0083df5ded045eabf2f5 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -1,4 +1,4 @@
-/* -*- mode: c++; c-file-style: "linux" -*- */
+/* -*- mode: c++; c-file-style: "linux"; indent-tabs-mode: t -*- */
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
@@ -27,7 +27,7 @@
  * inconsistent state of indentation.
  */
 
-%code requires {
+%{
 
 #define yyerror Lily_parser::parser_error
 
@@ -49,7 +49,7 @@
                 free (p);                                               \
         } while (0)
 
-}
+%}
 
 %parse-param {Lily_parser *parser}
 %parse-param {SCM *retval}
@@ -1082,6 +1082,7 @@ closed_music:
        {
                $$ = FINISH_MAKE_SYNTAX ($1, @$, $2);
        }
+       | music_function_call_closed
        ;
 
 music_bare:
@@ -2029,7 +2030,7 @@ music_function_chord_body:
 // with the last argument of the event function or with the expression
 // for which the function call acts itself as event.
 
-music_function_event:
+music_function_call_closed:
        MUSIC_FUNCTION function_arglist_closed {
                $$ = MAKE_SYNTAX ("music-function", @$,
                                         $1, $2);
@@ -2100,7 +2101,7 @@ post_event_nofinger:
        direction_less_event {
                $$ = $1;
        }
-       | script_dir music_function_event {
+       | script_dir music_function_call_closed {
                $$ = $2;
                if (!SCM_UNBNDP ($1))
                {