From 5adc8459347a24fc1e8ac5ef3f2362e8adcbf751 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 6 Apr 2005 11:21:21 +0000 Subject: [PATCH] (lilypond-main): use variable argument count for exception handler. --- buildscripts/guile-gnome.sh | 2 +- scm/lily.scm | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/buildscripts/guile-gnome.sh b/buildscripts/guile-gnome.sh index b5ac03b293..99dbe2f738 100644 --- 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 1ce64cca76..d6d76fdd5f 100644 --- 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) -- 2.39.5