Merge branch 'master' into translation

[lilypond.git] / lily / font-interface.cc

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index 4e6f5aac050628bda6a512046c95ff733a28c182..8f1e2c3b5271b8cc48156041dd793c709bf5942b 100644 (file)
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -45,7 +45,7 @@ Font_interface::music_font_alist_chain (Grob *g)
 {
   SCM defaults
     = g->layout ()->lookup_variable (ly_symbol2scm ("font-defaults"));
-  if (defaults == SCM_UNDEFINED)
+  if (SCM_UNBNDP (defaults))
     defaults = SCM_EOL;
   return g->get_property_alist_chain (defaults);
 }
@@ -55,7 +55,7 @@ Font_interface::text_font_alist_chain (Grob *g)
 {
   SCM defaults
     = g->layout ()->lookup_variable (ly_symbol2scm ("text-font-defaults"));
-  if (defaults == SCM_UNDEFINED)
+  if (SCM_UNBNDP (defaults))
     defaults = SCM_EOL;
   return g->get_property_alist_chain (defaults);
 }