(lilypond-main): use variable argument count for

exception handler.

diff --git a/buildscripts/guile-gnome.sh b/buildscripts/guile-gnome.sh
index b5ac03b293b40314848c509350de7ddb38e1eded..99dbe2f738fb0853019b201815cc15e4da9ec64c 100644 (file)
--- a/buildscripts/guile-gnome.sh
+++ b/buildscripts/guile-gnome.sh
@@ -243,4 +243,4 @@ EOF
 
 # simple test -- fails atm
 # guile -s ../src/libgnomecanvas/examples/canvas.scm
-
+g

diff --git a/scm/lily.scm b/scm/lily.scm
index 1ce64cca76ba83bf6b41fd1ef11cd1e357043864..d6d76fdd5f616673c52f8ca1649114a65d7bcfc0 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -302,11 +302,13 @@ The syntax is the same as `define*-public'."
 (define-public (lilypond-main files)
   "Entry point for LilyPond."
   (let* ((failed '())
-        (handler (lambda (key . arg) (set! failed (append arg failed)))))
+        (handler (lambda (key failed-file)
+                   (set! failed (append (list failed-file) failed)))))
     (for-each
      (lambda (f)
-       (catch 'ly-file-failed (lambda () (ly:parse-file f))
-             (lambda (x) (handler x f)))
+       (catch 'ly-file-failed
+             (lambda () (ly:parse-file f))
+             (lambda (x . args) (handler x f)))
        (if #f
           (dump-gc-protects)))
      files)