From: David Kastrup <dak@gnu.org>
Date: Thu, 23 Mar 2017 23:16:45 +0000 (+0100)
Subject: Issue 5105/1: Let \mark warnings show input location
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=38e5adec458f3ef1c5626022b4fe50e92140c176;p=lilypond.git

Issue 5105/1: Let \mark warnings show input location
---

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 2242a44f22..b96ef69182 100644
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -146,14 +146,16 @@ Mark_engraver::process_music ()
               m = scm_call_2 (proc, m, context ()->self_scm ());
             }
           else
-            /* FIXME: constant error message.  */
-            warning (_ ("rehearsalMark must have integer value"));
+            /* Score.rehearsalMark is initialized to #1 so we
+               never should see this case without user error */
+            mark_ev_->origin ()->warning
+              (_ ("rehearsalMark must have integer value"));
         }
 
       if (Text_interface::is_markup (m))
         text_->set_property ("text", m);
       else
-        warning (_ ("mark label must be a markup object"));
+        mark_ev_->origin ()->warning (_ ("mark label must be a markup object"));
     }
 }