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

[lilypond.git] / ly / init.ly

diff --git a/ly/init.ly b/ly/init.ly
index da97ded0e6c662740b7e0d30ffe750b0b29206ae..c3db3b37170810826995247621026c213d36379f 100644 (file)
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -42,5 +42,7 @@
    (apply ly:make-book $defaultpaper $defaultheader toplevel-scores)))
 
 
-#(if expect-error
-  (ly:parser-clear-error parser))
+#(if (eq? expect-error (ly:parser-has-error? parser))
+  (ly:parser-clear-error parser)
+  (if expect-error
+   (ly:parser-error parser (_ "expected error, but none found"))))