From 7b9226ba4422b50b5ad86cd29ad0c4bed11e0c18 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Fri, 9 Jun 2006 02:15:49 +0000 Subject: [PATCH] (set_lface_from_font_name): If a font doesn't have a name, set LFACE_FONT (lface) to nil. --- src/xfaces.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/xfaces.c b/src/xfaces.c index 9adc9218f6d..cf3e444ef60 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -3628,8 +3628,11 @@ set_lface_from_font_name (f, lface, fontname, force_p, may_fail_p) 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 */ -- 2.39.5