Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index 06c38c4e0ca9808b1cc9933c1bed028d93be9b63..64d6103d44d51dff51dd7900ed4100c4551802c5 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -80,7 +80,6 @@ using namespace std;
 #include "lily-guile.hh"
 #include "lily-lexer.hh"
 #include "lily-parser.hh"
-#include "lilypond-input-version.hh"
 #include "main.hh"
 #include "misc.hh"
 #include "music.hh"
@@ -157,7 +156,6 @@ void set_music_properties (Music *p, SCM a);
 /* Keyword tokens with plain escaped name.  */
 %token ACCEPTS "\\accepts"
 %token ADDLYRICS "\\addlyrics"
-%token ADDQUOTE "\\addquote"
 %token ALIAS "\\alias"
 %token ALTERNATIVE "\\alternative"
 %token BOOK "\\book"
@@ -1457,7 +1455,6 @@ command_event:
        | MARK DEFAULT  {
                Music *m = MY_MAKE_MUSIC ("MarkEvent", @$);
                $$ = m->unprotect ();
-               scm_display($$, SCM_UNDEFINED);
        }
        | tempo_event {
                $$ = $1;