From: Chong Yidong <cyd@stupidchicken.com>
Date: Tue, 28 Jul 2009 15:00:51 +0000 (+0000)
Subject: * xfaces.c (face_with_height): Call font_clear_prop.
X-Git-Tag: emacs-23.1~9
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d9cae38345083e44b7a90b9c567b7e05915c2bd8;p=emacs.git

* xfaces.c (face_with_height): Call font_clear_prop.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 50cdcd733e8..b6ce0fad6f2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-28  Kenichi Handa  <handa@m17n.org>
+
+	* xfaces.c (face_with_height): Call font_clear_prop.
+
 2009-07-28  Kenichi Handa  <handa@m17n.org>
 
 	* font.c (font_parse_xlfd): Check DPI and AVGWIDTH properties more
diff --git a/src/xfaces.c b/src/xfaces.c
index 704d7a92049..9eb3d36211b 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4959,6 +4959,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 */