Merge branch 'master' of ssh+git://jneem@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / scm / lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index 954aa97d2af9c10d9568dcad47db2328f9702791..32ab98e88e2a486b72c88d054380da72f3e9063b 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -139,7 +139,7 @@ on errors, and print a stack trace.")
     (if (ly:get-option 'verbose)
        (ly:progress "[~A" file-name))
     (if (not file-name)
-       (ly:error (_ "Can't find ~A" x)))
+       (ly:error (_ "Can't find ~A") x))
     (primitive-load file-name)
     (if (ly:get-option 'verbose)
        (ly:progress "]"))))
@@ -415,7 +415,10 @@ The syntax is the same as `define*-public'."
          (format "~a ~a ~a\n"
                  gc-protect-stat-count
                  sym
-                 (cdr (assoc sym stats)))
+                 (let ((sym-stat (assoc sym stats)))
+                   (if sym-stat 
+                       (cdr sym-stat)
+                       "?")))
          outfile))
        '(protected-objects bytes-malloced cell-heap-size
                           
@@ -538,7 +541,7 @@ The syntax is the same as `define*-public'."
        (ly:clear-anonymous-modules)
        (if (ly:get-option 'debug-gc)
           (dump-gc-protects)
-          (if (= (rand 40) 1)
+          (if (= (random 40) 1)
               (ly:reset-all-fonts))))
 
      files)