From: Kenichi Handa <handa@m17n.org>
Date: Tue, 17 Jun 2008 04:50:11 +0000 (+0000)
Subject: (realize_default_face): If the frame is not on window
X-Git-Tag: emacs-pretest-23.0.90~4712
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=70d6ecc654a345dd495a722eda68fb0f94f64472;p=emacs.git

(realize_default_face): If the frame is not on window
system, set the fontset of face to nil.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 0eebe5ce290..6e66c7f4743 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-17  Kenichi Handa  <handa@m17n.org>
+
+	* xfaces.c (realize_default_face): If the frame is not on window
+	system, set the fontset of face to nil.
+
 2008-06-17  Naohiro Aota  <nao.aota@gmail.com>  (tiny change)
 
 	* fontset.c (fontset_pattern_regexp): Escape some reg-expr
diff --git a/src/xfaces.c b/src/xfaces.c
index 15d6e6bcbf6..fba5a3ba4f7 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5587,6 +5587,8 @@ realize_default_face (f)
 	LFACE_WEIGHT (lface) = Qnormal;
       if (UNSPECIFIEDP (LFACE_SLANT (lface)))
 	LFACE_SLANT (lface) = Qnormal;
+      if (UNSPECIFIEDP (LFACE_FONTSET (lface)))
+	LFACE_FONTSET (lface) = Qnil;
     }
 
   if (UNSPECIFIEDP (LFACE_UNDERLINE (lface)))