From: Kenichi Handa <handa@m17n.org>
Date: Wed, 19 Feb 2003 06:15:15 +0000 (+0000)
Subject: (try_alternative_families): Try all scalable fonts if
X-Git-Tag: ttn-vms-21-2-B4~11129
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f9a45bb340f4e9d4c9718a4f328752f032beeaa2;p=emacs.git

(try_alternative_families): Try all scalable fonts if
Vscalable_fonts_allowed is not Qt.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index c37562fb095..f01d8bcc1ab 100644
--- 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,Ad(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 7c668bc5787..a68a1eacad3 100644
--- 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);