diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2016-02-25 21:59:57 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2016-02-25 21:59:57 +0200 |
| commit | d2dd614716e34edb5891e58c029741cd6b32217d (patch) | |
| tree | bf321a6a6af180fc32db666a40ea69d9bb7ee4ad | |
| parent | 9b7593c47a22d63e0b20b5f7a840827ff7bf2cf6 (diff) | |
| download | emacs-d2dd614716e34edb5891e58c029741cd6b32217d.tar.gz | |
Remove unneeded workaround in xftfont.c
* src/xftfont.c (xftfont_open): Remove "dirty workaround" for
XftTextExtents8 behavior, as it is no longer needed. Suggested by
Fangwen Yu <yynyygy@gmail.com>. (Bug#22383)
| -rw-r--r-- | src/xftfont.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/xftfont.c b/src/xftfont.c index 110f99a9be9..d94955f296a 100644 --- a/src/xftfont.c +++ b/src/xftfont.c @@ -395,16 +395,6 @@ xftfont_open (struct frame *f, Lisp_Object entity, int pixel_size) font->ascent = xftfont->ascent; font->descent = xftfont->descent; - if (pixel_size >= 5) - { - /* The above condition is a dirty workaround because - XftTextExtents8 behaves strangely for some fonts - (e.g. "Dejavu Sans Mono") when pixel_size is less than 5. */ - if (font->ascent < extents.y) - font->ascent = extents.y; - if (font->descent < extents.height - extents.y) - font->descent = extents.height - extents.y; - } font->height = font->ascent + font->descent; if (XINT (AREF (entity, FONT_SIZE_INDEX)) == 0) |