From: David Kastrup <dak@gnu.org>
Date: Tue, 6 Oct 2015 13:24:14 +0000 (+0200)
Subject: Issue 4630/1: Add location info override to some music expressions
X-Git-Tag: release/2.19.29-1~8
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=fd7e58a2d700ac0bd926268dece7afcb161bd9fa;p=lilypond.git

Issue 4630/1: Add location info override to some music expressions

This gives location information for #{ ... #} to music function callers
instead of the music function body.
---

diff --git a/lily/parser.yy b/lily/parser.yy
index a166aee8e5..ad10401441 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -2811,8 +2811,8 @@ note_chord_element:
 		  unsmob<Music> (scm_car (s))->set_property ("duration", dur);
 		es = ly_append2 (es, postevs);
 
-		m-> set_property ("elements", es);
-		m->set_spot (@$);
+		m->set_property ("elements", es);
+		m->set_spot (parser->lexer_->override_input (@$));
 		$$ = m->self_scm ();
 	} %prec ':'
 	;
@@ -2919,7 +2919,7 @@ post_events:
 					$$ = scm_cons (scm_car (p), $$);
 				}
 			} else {
-				m->set_spot (@2);
+				m->set_spot (parser->lexer_->override_input (@2));
 				$$ = scm_cons ($2, $$);
 			}
 		}