* xfaces.c (face_with_height): Call font_clear_prop.

diff --git a/src/ChangeLog b/src/ChangeLog
index 50cdcd733e89647b7f716d9bf97bbb83c7fb04e7..b6ce0fad6f2fdfa78fbe5a6818a5aee954381318 100644 (file)
--- 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 704d7a92049f108291cd27749e4cd418c6627024..9eb3d36211b5c48c4260eaf3cfbd54e7e87253c2 100644 (file)
--- 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 */