(try_font_list): Pay attention to the case that FAMILY is nil.

diff --git a/src/ChangeLog b/src/ChangeLog
index bae54ef29a73b8f1d17a8f0450ee36759ca391c7..73abc9bdfa4e2c91f20d4e69751bb23d39583964 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-27  Kenichi Handa  <handa@etl.go.jp>
+
+       * xfaces.c (try_font_list): Pay attention to the case that FAMILY
+       is nil.
+
 2002-09-26  Richard M. Stallman  <rms@gnu.org>
 
        * regex.h (__restrict_arr): Don't define if already defined.

diff --git a/src/xfaces.c b/src/xfaces.c
index 57749ea5634eb96e2fe2ba2856e3819ac167c49c..d5ddd6b40de70efc756ce31f27748b161f5ba609 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6343,7 +6343,7 @@ try_font_list (f, attrs, family, registry, fonts, prefer_face_family)
   Lisp_Object face_family = attrs[LFACE_FAMILY_INDEX];
   Lisp_Object try_family;
 
-  try_family = prefer_face_family ? face_family : family;
+  try_family = (prefer_face_family || NILP (family)) ? face_family : family;
 
   if (STRINGP (try_family))
     nfonts = try_alternative_families (f, try_family, registry, fonts);
@@ -6359,7 +6359,7 @@ try_font_list (f, attrs, family, registry, fonts, prefer_face_family)
     nfonts = try_alternative_families (f, try_family, Qnil, fonts);
 #endif
 
-  if (! prefer_face_family)
+  if (EQ (try_family, family))
     family = face_family;
 
   if (nfonts == 0 && STRINGP (family))