Fix #287.

diff --git a/scm/lily.scm b/scm/lily.scm
index f83d96bec152875f3b26c336d287c4986d07c172..94760bb5a849f635a5ea9a61d400157a574b57d6 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -542,17 +542,28 @@ The syntax is the same as `define*-public'."
 (define-public (lilypond-main files)
   "Entry point for LilyPond."
 
-  (define (no-files-handler)
-    (ly:usage)
-    (exit 2))
 
   (eval-string (ly:command-line-code))
+
+  (if (ly:get-option 'help)
+      (begin
+       (ly:option-usage)
+       (exit 0)))
+
+  (if (ly:get-option 'show-available-fonts)
+      (begin
+       (ly:font-config-display-fonts)
+       (exit 0)
+       ))
+  
   
   (if (ly:get-option 'gui)
       (gui-main files))
 
   (if (null? files)
-      (no-files-handler))
+      (begin
+       (ly:usage)
+       (exit 2)))
 
   (if (ly:get-option 'read-file-list)
       (set! files
@@ -642,16 +653,6 @@ The syntax is the same as `define*-public'."
          (exit 0)))))
 
 (define-public (lilypond-all files)
-  (if (ly:get-option 'help)
-      (begin
-       (ly:option-usage)
-       (exit 0)))
-  (if (ly:get-option 'show-available-fonts)
-      (begin
-       (ly:font-config-display-fonts)
-       (exit 0)
-       ))
-  
   (let* ((failed '())
         (separate-logs (ly:get-option 'separate-log-files))
         (do-measurements (ly:get-option 'dump-profile))