(try_alternative_families): Try all scalable fonts if

Vscalable_fonts_allowed is not Qt.

diff --git a/src/ChangeLog b/src/ChangeLog
index c37562fb095bb46fdb0a6c8247ef7a637c0b9766..f01d8bcc1ab84ddf1e08ccfc7f7f49a60d55611c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-19  Kenichi Handa  <handa@m17n.org>
+
+       * xfaces.c (try_alternative_families): Try all scalable fonts if
+       Vscalable_fonts_allowed is not Qt.
+
 2003-02-19  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
        * xfaces.c (x_face_list_fonts): Set *pfonts to 0 if no fonts found.

diff --git a/src/xfaces.c b/src/xfaces.c
index 7c668bc57876a2dfbe2318fa50a9f326412f4bf8..a68a1eacad3286fe55edc5f380b56fea52f69016 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6320,8 +6320,8 @@ try_alternative_families (f, family, registry, fonts)
            }
        }
 
-      /* Try scalable fonts before giving up.  */
-      if (nfonts == 0 && NILP (Vscalable_fonts_allowed))
+      /* Try all scalable fonts before giving up.  */
+      if (nfonts == 0 && ! EQ (Vscalable_fonts_allowed, Qt))
        {
          int count = SPECPDL_INDEX ();
          specbind (Qscalable_fonts_allowed, Qt);