diff options
author | Kenichi Handa <handa@m17n.org> | 2008-05-25 11:04:53 +0000 |
---|---|---|
committer | Kenichi Handa <handa@m17n.org> | 2008-05-25 11:04:53 +0000 |
commit | 951b8112ca8f04c26ba1be0c97a99a043122b39d (patch) | |
tree | d2962bda0860653ee0f8c469fe66f38716bb4051 | |
parent | 97b816fb9360395e13585a93771506abc7471610 (diff) | |
download | emacs-951b8112ca8f04c26ba1be0c97a99a043122b39d.tar.gz emacs-951b8112ca8f04c26ba1be0c97a99a043122b39d.tar.bz2 emacs-951b8112ca8f04c26ba1be0c97a99a043122b39d.zip |
(xftfont_open): Delete unused variable. If
underline_thickness is not 1, adjust underline_position.
-rw-r--r-- | src/xftfont.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/xftfont.c b/src/xftfont.c index 4b0a15deba9..27fbd7241a4 100644 --- a/src/xftfont.c +++ b/src/xftfont.c @@ -185,7 +185,7 @@ xftfont_open (f, entity, pixel_size) int pixel_size; { Display *display = FRAME_X_DISPLAY (f); - Lisp_Object val, filename, cache, font_object; + Lisp_Object val, filename, font_object; FcPattern *pat = NULL; struct xftfont_info *xftfont_info = NULL; struct font *font; @@ -294,6 +294,8 @@ xftfont_open (f, entity, pixel_size) font->underline_position = -ft_face->underline_position * size / upEM; font->underline_thickness = -ft_face->underline_thickness * size / upEM; + if (font->underline_thickness > 2) + font->underline_position -= font->underline_thickness / 2; } else { |