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

[lilypond.git] / scm / lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index c8f99d6737a31b9271943190c046366749b4040e..17063a9aef80eaccafd5cc31f49a083a6f534f28 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -40,7 +40,7 @@ and scale down result to prevent jaggies in
 PNG images.")
     (backend ps
 "Select backend.  Possible values: 'eps, 'null,
-'ps, 'scm, 'svg.")
+'ps, 'scm, 'socket, 'svg.")
     (check-internal-types #f
 "Check every property assignment for types.")
     (clip-systems #f
@@ -153,8 +153,8 @@ second.  Dump results to `FILE.stacks' and
     (verbose ,(ly:command-line-verbose?)
 "Value of the --verbose flag (read-only).")
     (warning-as-error #f
-"Exit if an undefined stencil expression is
-found.")
+"Change all warning and programming_error
+messages into errors.")
     ))
 
 ;; Need to do this in the beginning.  Other parts of the Scheme
@@ -229,6 +229,11 @@ found.")
 (if (ly:get-option 'trace-scheme-coverage)
     (coverage:enable))
 
+(if (ly:get-option 'warning-as-error)
+    (begin
+      (set! ly:warning ly:error)
+      (set! ly:programming-error ly:error)))
+
 (define-public parser #f)