diff options
| author | Kenichi Handa <handa@m17n.org> | 2010-09-29 09:52:03 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2010-09-29 09:52:03 +0900 |
| commit | 18acb5ad4fcf3b8b00aacaca14cb5e0b24a854c4 (patch) | |
| tree | 8bc15add6f295c15a427d20e2c9b1c63d9b861e0 /src | |
| parent | fd057fd25e400a18cc83ba17ce487c760a78f18d (diff) | |
| download | emacs-18acb5ad4fcf3b8b00aacaca14cb5e0b24a854c4.tar.gz | |
xfont.c (xfont_open): Fix setting of font->average_width from :avgwidth property (Bug#7123).
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xfont.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 435c09f0ff8..55636cc9f40 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-09-29 Kenichi Handa <handa@m17n.org> + + * xfont.c (xfont_open): Fix setting of font->average_width from + :avgwidth property (Bug#7123). + 2010-09-26 Jan Djärv <jan.h.d@swipnet.se> * xgselect.c (xg_select): Clear file descriptors not set from diff --git a/src/xfont.c b/src/xfont.c index d8fe40eaa93..a676cd29c82 100644 --- a/src/xfont.c +++ b/src/xfont.c @@ -861,7 +861,7 @@ xfont_open (f, entity, pixel_size) val = Ffont_get (font_object, QCavgwidth); if (INTEGERP (val)) - font->average_width = XINT (val); + font->average_width = XINT (val) / 10; if (font->average_width < 0) font->average_width = - font->average_width; if (font->average_width == 0 |