aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xfaces.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c37562fb095..f01d8bcc1ab 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12003-02-19 Kenichi Handa <handa@m17n.org>
2
3 * xfaces.c (try_alternative_families): Try all scalable fonts if
4 Vscalable_fonts_allowed is not Qt.
5
12003-02-19 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> 62003-02-19 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2 7
3 * xfaces.c (x_face_list_fonts): Set *pfonts to 0 if no fonts found. 8 * 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)
6320 } 6320 }
6321 } 6321 }
6322 6322
6323 /* Try scalable fonts before giving up. */ 6323 /* Try all scalable fonts before giving up. */
6324 if (nfonts == 0 && NILP (Vscalable_fonts_allowed)) 6324 if (nfonts == 0 && ! EQ (Vscalable_fonts_allowed, Qt))
6325 { 6325 {
6326 int count = SPECPDL_INDEX (); 6326 int count = SPECPDL_INDEX ();
6327 specbind (Qscalable_fonts_allowed, Qt); 6327 specbind (Qscalable_fonts_allowed, Qt);