[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 d2dd614: Remove unneeded workaround in xftfont.c
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-25 d2dd614: Remove unneeded workaround in xftfont.c |
Date: |
Thu, 25 Feb 2016 20:01:32 +0000 |
branch: emacs-25
commit d2dd614716e34edb5891e58c029741cd6b32217d
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
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 <address@hidden>. (Bug#22383)
---
src/xftfont.c | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/src/xftfont.c b/src/xftfont.c
index 110f99a..d94955f 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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 d2dd614: Remove unneeded workaround in xftfont.c,
Eli Zaretskii <=