Fix potential NULL dereference in Staff_symbol::on_line().

[lilypond.git] / ly / init.ly

diff --git a/ly/init.ly b/ly/init.ly
index da97ded0e6c662740b7e0d30ffe750b0b29206ae..a4bd1c3a3985a466f1c888ac2a58e30197739ae8 100644 (file)
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -16,7 +16,7 @@
 #(define version-seen #f)
 #(define expect-error #f) 
 #(define output-empty-score-list #f)
-
+#(define output-suffix #f)
 #(use-modules (scm clip-region))
 \maininput
 %% there is a problem at the end of the input file
@@ -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
@@ -42,5 +43,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"))))