aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2009-07-27 04:19:57 +0000
committerKenichi Handa2009-07-27 04:19:57 +0000
commita8c0cc186d6d37a07ab2bfe50e4a0a46abe663ce (patch)
tree48c1b74dcd8ddecd76afbabf5a84352d269c4e09 /src
parent051e86dc55c9c53a0bbe75243a43b73c65bf4dcb (diff)
downloademacs-a8c0cc186d6d37a07ab2bfe50e4a0a46abe663ce.tar.gz
emacs-a8c0cc186d6d37a07ab2bfe50e4a0a46abe663ce.zip
(face_with_height): Call font_clear_prop.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xfaces.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0205c76c38d..bc3f9b57ba4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12009-07-27 Kenichi Handa <handa@m17n.org>
2
3 * xfaces.c (face_with_height): Call font_clear_prop.
4
12009-07-26 Chong Yidong <cyd@stupidchicken.com> 52009-07-26 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * dispnew.c (init_display): Use Qx, Qw32, and Qns. 7 * 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)
4958 face = FACE_FROM_ID (f, face_id); 4958 face = FACE_FROM_ID (f, face_id);
4959 bcopy (face->lface, attrs, sizeof attrs); 4959 bcopy (face->lface, attrs, sizeof attrs);
4960 attrs[LFACE_HEIGHT_INDEX] = make_number (height); 4960 attrs[LFACE_HEIGHT_INDEX] = make_number (height);
4961 font_clear_prop (attrs, FONT_SIZE_INDEX);
4961 face_id = lookup_face (f, attrs); 4962 face_id = lookup_face (f, attrs);
4962#endif /* HAVE_WINDOW_SYSTEM */ 4963#endif /* HAVE_WINDOW_SYSTEM */
4963 4964