From: Kenichi Handa <handa@m17n.org>
Date: Mon, 27 Jul 2009 04:19:57 +0000 (+0000)
Subject: (face_with_height): Call font_clear_prop.
X-Git-Tag: emacs-pretest-23.1.90~2014
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a8c0cc186d6d37a07ab2bfe50e4a0a46abe663ce;p=emacs.git

(face_with_height): Call font_clear_prop.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 0205c76c38d..bc3f9b57ba4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-27  Kenichi Handa  <handa@m17n.org>
+
+	* xfaces.c (face_with_height): Call font_clear_prop.
+
 2009-07-26  Chong Yidong  <cyd@stupidchicken.com>
 
 	* dispnew.c (init_display): Use Qx, Qw32, and Qns.
diff --git a/src/xfaces.c b/src/xfaces.c
index 3faaf247296..4f808e41beb 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4958,6 +4958,7 @@ face_with_height (f, face_id, height)
   face = FACE_FROM_ID (f, face_id);
   bcopy (face->lface, attrs, sizeof attrs);
   attrs[LFACE_HEIGHT_INDEX] = make_number (height);
+  font_clear_prop (attrs, FONT_SIZE_INDEX);
   face_id = lookup_face (f, attrs);
 #endif /* HAVE_WINDOW_SYSTEM */