aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2015-08-12 18:55:38 +0300
committerEli Zaretskii2015-08-12 18:55:38 +0300
commitb367d7fc7b234bb98b330ac61bf35372f0f0acae (patch)
tree8cd354eba6c5b6cd1a391098bd167eff002bf281 /src
parent79a169684dfad2c0bbb9fdbae539c1f30d9f0ac3 (diff)
downloademacs-b367d7fc7b234bb98b330ac61bf35372f0f0acae.tar.gz
emacs-b367d7fc7b234bb98b330ac61bf35372f0f0acae.zip
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)
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c2
1 files changed, 1 insertions, 1 deletions
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)
19229 funny, and height of empty lines will be incorrect. */ 19229 funny, and height of empty lines will be incorrect. */
19230 g = it->glyph_row->glyphs[TEXT_AREA] + n; 19230 g = it->glyph_row->glyphs[TEXT_AREA] + n;
19231 struct font *font = face->font ? face->font : FRAME_FONT (it->f); 19231 struct font *font = face->font ? face->font : FRAME_FONT (it->f);
19232 if (n == 0 || it->glyph_row->height < font->pixel_size) 19232 if (n == 0)
19233 { 19233 {
19234 Lisp_Object height, total_height; 19234 Lisp_Object height, total_height;
19235 int extra_line_spacing = it->extra_line_spacing; 19235 int extra_line_spacing = it->extra_line_spacing;