diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2009-07-28 15:00:51 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2009-07-28 15:00:51 +0000 |
| commit | d9cae38345083e44b7a90b9c567b7e05915c2bd8 (patch) | |
| tree | 457dd685e73536a209efeaa3c0b2cb5be829421d | |
| parent | cdd29a5c0958812e4d06488b1050c540d438d15a (diff) | |
| download | emacs-d9cae38345083e44b7a90b9c567b7e05915c2bd8.tar.gz | |
* xfaces.c (face_with_height): Call font_clear_prop.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xfaces.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 50cdcd733e8..b6ce0fad6f2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 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 rigidly. 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 */ |