From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 12 Aug 2015 15:55:38 +0000 (+0300)
Subject: Fix display of thin lines whose newline has line-height property of t
X-Git-Tag: emacs-25.0.90~1373^2~51
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b367d7fc7b234bb98b330ac61bf35372f0f0acae;p=emacs.git

Fix display of thin lines whose newline has line-height property of t

* src/xdisp.c (append_space_for_newline): Don't try to fix ascent
and descent values of non-empty glyph rows, since they could have
forced low values deliberately.  (Bug#21243)
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 7371216d387..9b761746252 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -19229,7 +19229,7 @@ append_space_for_newline (struct it *it, bool default_face_p)
 	     funny, and height of empty lines will be incorrect.  */
 	  g = it->glyph_row->glyphs[TEXT_AREA] + n;
 	  struct font *font = face->font ? face->font : FRAME_FONT (it->f);
-	  if (n == 0 || it->glyph_row->height < font->pixel_size)
+	  if (n == 0)
 	    {
 	      Lisp_Object height, total_height;
 	      int extra_line_spacing = it->extra_line_spacing;