Mercurial > emacs
changeset 90444:cd20cf7f26f9
(set_lface_from_font_name): If a font doesn't have a
name, set LFACE_FONT (lface) to nil.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Fri, 09 Jun 2006 02:15:49 +0000 |
| parents | 57b847825c30 |
| children | 663318f2775b |
| files | src/xfaces.c |
| diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xfaces.c Fri Jun 09 02:15:38 2006 +0000 +++ b/src/xfaces.c Fri Jun 09 02:15:49 2006 +0000 @@ -3628,8 +3628,11 @@ LFACE_SWIDTH (lface) = NILP (symbol) ? width : symbol; } - ASET (lface, LFACE_FONT_INDEX, Ffont_xlfd_name (font->entity)); - ASET (lface, LFACE_FONTSET_INDEX, fontset_name (fontset)); + if (font->font.full_name) + LFACE_FONT (lface) = build_string (font->font.full_name); + else + LFACE_FONT (lface) = Qnil; + LFACE_FONTSET (lface) = fontset_name (fontset); return 1; } #endif /* USE_FONT_BACKEND */