Commit e21880c6 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

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

parent 05f829ce
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.
......
......@@ -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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment