From: Kenichi Handa <handa@m17n.org>
Date: Fri, 9 Jun 2006 02:15:49 +0000 (+0000)
Subject: (set_lface_from_font_name): If a font doesn't have a
X-Git-Tag: emacs-pretest-23.0.90~8295^2~906
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7b9226ba4422b50b5ad86cd29ad0c4bed11e0c18;p=emacs.git

(set_lface_from_font_name): If a font doesn't have a
name, set LFACE_FONT (lface) to nil.
---

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 */