Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into topic...

[lilypond.git] / ly / init.ly

diff --git a/ly/init.ly b/ly/init.ly
index f6c928e301ec8f6e6af0cca07b2a89241b8f25cc..6dc602828cbdc95eee9ec3354a840b50307a9057 100644 (file)
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -34,6 +34,7 @@
       (defined? 'input-file-name))
   (version-not-seen-message input-file-name))
 
+#(ly:set-option 'protected-scheme-parsing #f)
 #(if (or (pair? toplevel-scores) output-empty-score-list)
   ((if (defined? 'default-toplevel-book-handler)
     default-toplevel-book-handler
@@ -44,4 +45,5 @@
 
 #(if (eq? expect-error (ly:parser-has-error? parser))
   (ly:parser-clear-error parser)
-  (ly:parser-error parser (_ "expected error, but none found")))
+  (if expect-error
+   (ly:parser-error parser (_ "expected error, but none found"))))