aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2016-02-25 21:59:57 +0200
committerEli Zaretskii2016-02-25 21:59:57 +0200
commitd2dd614716e34edb5891e58c029741cd6b32217d (patch)
treebf321a6a6af180fc32db666a40ea69d9bb7ee4ad /src
parent9b7593c47a22d63e0b20b5f7a840827ff7bf2cf6 (diff)
downloademacs-d2dd614716e34edb5891e58c029741cd6b32217d.tar.gz
emacs-d2dd614716e34edb5891e58c029741cd6b32217d.zip
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)
Diffstat (limited to 'src')
-rw-r--r--src/xftfont.c10
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)
395 395
396 font->ascent = xftfont->ascent; 396 font->ascent = xftfont->ascent;
397 font->descent = xftfont->descent; 397 font->descent = xftfont->descent;
398 if (pixel_size >= 5)
399 {
400 /* The above condition is a dirty workaround because
401 XftTextExtents8 behaves strangely for some fonts
402 (e.g. "Dejavu Sans Mono") when pixel_size is less than 5. */
403 if (font->ascent < extents.y)
404 font->ascent = extents.y;
405 if (font->descent < extents.height - extents.y)
406 font->descent = extents.height - extents.y;
407 }
408 font->height = font->ascent + font->descent; 398 font->height = font->ascent + font->descent;
409 399
410 if (XINT (AREF (entity, FONT_SIZE_INDEX)) == 0) 400 if (XINT (AREF (entity, FONT_SIZE_INDEX)) == 0)