(x_load_font): Don't use the font's max_bounds for

computing the height of the font.  If max_bounds' ascent or
descent are greater than the font's ascent or descent, this means
glyphs overlap, which should be handled now by redisplay.

2 files changed, 7 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a3d3a31d4c6..38b12414b86 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2000-12-06  Gerd Moellmann  <gerd@gnu.org>
+
+        * xterm.c (x_load_font): Don't use the font's max_bounds for
+        computing the height of the font.  If max_bounds' ascent or
+        descent are greater than the font's ascent or descent, this means
+        glyphs overlap, which should be handled now by redisplay.
+
 2000-12-06  Miles Bader  <miles@gnu.org>
 
         * xfaces.c (Finternal_set_lisp_face_attribute): If FRAME is `t',
diff --git a/src/xterm.c b/src/xterm.c
index da53834e08f..f30ee0159fd 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -13213,13 +13213,6 @@ x_load_font (f, fontname, size)
 
     fontp->size = font->max_bounds.width;
     fontp->height = FONT_HEIGHT (font);
-    {
-      /* For some font, ascent and descent in max_bounds field is
-         larger than the above value.  */
-      int max_height = font->max_bounds.ascent + font->max_bounds.descent;
-      if (max_height > fontp->height)
-        fontp->height = max_height;
-    }
 
     if (NILP (font_names))
       {