From: David Kastrup <dak@gnu.org>
Date: Sat, 11 May 2013 12:46:43 +0000 (+0200)
Subject: Issue 3352: Don't let eval-carefully bomb out on scalar non-symbols
X-Git-Tag: release/2.17.19-1~8^2~13
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=721b84a22f7da5cb3eea8a5fbe82995cc43b0807;p=lilypond.git

Issue 3352: Don't let eval-carefully bomb out on scalar non-symbols

This caused a programming error on invalid paper sizes.
---

diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index d87bca208a..939e5caa88 100644
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -932,13 +932,10 @@ in module @var{module}.  In that case evaluate, otherwise
 print a warning and set an optional @var{default}."
   (let* ((unavailable? (lambda (sym)
                          (not (module-defined? module sym))))
-	 (sym-unavailable (if (pair? symbol)
-	                      (filter
-			        unavailable?
-			        (filter symbol? (flatten-list symbol)))
-			      (if (unavailable? symbol)
-			           #t
-				   '()))))
+	 (sym-unavailable
+          (filter
+           unavailable?
+           (filter symbol? (flatten-list symbol)))))
     (if (null? sym-unavailable)
         (eval symbol module)
         (let* ((def (and (pair? default) (car default))))