summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Nieuwenhuizen <janneke@gnu.org>2005-05-23 22:05:07 +0000
committerJan Nieuwenhuizen <janneke@gnu.org>2005-05-23 22:05:07 +0000
commit51dd110b70e90258b17d0d3fb6be0a936be7628f (patch)
tree49fa3949fd4c3c01cf2ccdf4c8cac93439c8352a
parent020f55e9cd69e7f5370a5af5092a07954eb30312 (diff)
*** empty log message ***
-rw-r--r--ChangeLog2
-rw-r--r--scm/lily.scm6
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 12cbe88a79..546fb47f0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@
2005-05-23 Jan Nieuwenhuizen <janneke@gnu.org>
+ * scm/lily.scm (lilypond-all): Bugfix: return failed.
+
* lily/main.cc (setup_paths)[__MINGW32__]: Normalize LILYPONDPREFIX.
2005-05-21 Jan Nieuwenhuizen <janneke@gnu.org>
diff --git a/scm/lily.scm b/scm/lily.scm
index 46035c4f00..1580fe886e 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -361,7 +361,8 @@ The syntax is the same as `define*-public'."
(handler (lambda (key failed-file)
(set! failed (append (list failed-file) failed)))))
;;(handler (lambda (key . arg) (set! failed (append arg failed)))))
- (for-each (lambda (x) (lilypond-file handler x)) files)))
+ (for-each (lambda (x) (lilypond-file handler x)) files)
+ failed))
(define (lilypond-file handler file-name)
(catch 'ly-file-failed
@@ -396,6 +397,8 @@ The syntax is the same as `define*-public'."
(let ((failed (lilypond-all files)))
(if (pair? failed)
(begin
+ ;; ugh
+ (ly:stderr-redirect "foo" "r")
(system (get-editor-command log-name 0 0))
(ly:error (_ "failed files: ~S") (string-join failed))
;; not reached?
@@ -414,3 +417,4 @@ The syntax is the same as `define*-public'."
(or (not (running-from-gui?))
(ly:get-option 'safe)
(define lilypond-main gui-main))
+ (define lilypond-main gui-main)