Mercurial > emacs
changeset 47639:a7c8409f5cad
(try_font_list): Pay attention to the case that FAMILY is nil.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Fri, 27 Sep 2002 00:43:40 +0000 |
| parents | bf5c44a60878 |
| children | d5e4a276998c |
| files | src/xfaces.c |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xfaces.c Thu Sep 26 23:19:58 2002 +0000 +++ b/src/xfaces.c Fri Sep 27 00:43:40 2002 +0000 @@ -6343,7 +6343,7 @@ 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 @@ 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))