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

[lilypond.git] / lily / music-iterator.cc

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index ce824968a9b1d3242c8dd582c77a7ad4e749ac8d..3a97459f89565449b8c405b094b711eb6188224b 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -7,12 +7,11 @@
 */
 
 
-#include "music-iterator.hh"
-
 #include <cstdio>
 using namespace std;
 
 #include "warn.hh"
+#include "music.hh"
 #include "context.hh"
 #include "event-iterator.hh"
 #include "input.hh"
@@ -169,7 +168,7 @@ Music_iterator::report_event (Music *m)
     FIXME: then don't do it. 
   */
   if (!m->is_mus_type ("event"))
-    m->origin ()->programming_error (_f ("Sending non-event to context"));
+    m->origin ()->programming_error (_ ("Sending non-event to context"));
 
   m->send_to_context (get_outlet ());
 }