Imported Debian patch 2.12.3-3

[lilypond.git] / scm / lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index c39b243648613d4a0f475f8e40aca3a0b8dfa17c..3b6ef0dee7d00ccf4539730b4d800cf1de2cb526 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -242,7 +242,7 @@ second.  Dump results to `FILE.stacks' and
        (ly:error (_ "cannot find: ~A") x))
     (primitive-load file-name)
     (if (ly:get-option 'verbose)
-       (ly:progress "]"))))
+       (ly:progress "]\n"))))
 
 (define-public DOS
   (let ((platform (string-tokenize
@@ -673,7 +673,9 @@ PIDs or the number of the process."
          (if separate-logs
              (open-file (if (string-or-symbol? (ly:get-option 'log-file))
                             (format "~a.log" (ly:get-option 'log-file))
-                            "/dev/tty") "a") #f))
+                            (if (file-writable? "/dev/tty")
+                                ("/dev/tty")
+                                ("/dev/null"))) "a") #f))
         (do-measurements (ly:get-option 'dump-profile))
         (handler (lambda (key failed-file)
                    (set! failed (append (list failed-file) failed)))))
@@ -688,7 +690,7 @@ PIDs or the number of the process."
         (if separate-logs
             (ly:stderr-redirect (format "~a.log" base) "w"))
         (if ping-log
-            (format ping-log "Procesing ~a\n" base))
+            (format ping-log "Processing ~a\n" base))
         (if (ly:get-option 'trace-memory-frequency)
             (mtrace:start-trace  (ly:get-option 'trace-memory-frequency)))
         (lilypond-file handler x)
@@ -750,6 +752,6 @@ PIDs or the number of the process."
         ;; FIXME: soft-code, localize
         (welcome-ly (string-append ly "Welcome_to_LilyPond.ly"))
         (cmd (get-editor-command welcome-ly 0 0 0)))
-    (ly:message (_ "Invoking `~a'...") cmd)
+    (ly:message (_ "Invoking `~a'...\n") cmd)
     (system cmd)
     (exit 1)))