From 4dcd74e647a3843982238edfe19f8f390d9e47b7 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Sat, 27 Jan 2001 12:40:49 +0000 Subject: (display_line): Don't treat a newline as fitting on the line. --- src/ChangeLog | 5 +++++ src/xdisp.c | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 929096d98ee..76c2161b2bd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2001-01-27 Gerd Moellmann + + * xdisp.c (display_line): Don't treat a newline as fitting + on the line. + 2001-01-26 Gerd Moellmann * window.c (size_window): Set the window's orig_top to nil when diff --git a/src/xdisp.c b/src/xdisp.c index a8803c077ca..dffef44f487 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -12229,10 +12229,12 @@ display_line (it) nglyphs = row->used[TEXT_AREA] - n_glyphs_before; hpos_before = it->hpos; x_before = x; - - if (it->current_x < it->last_visible_x) - { + + if (/* Not a newline. */ + nglyphs > 0 /* Glyphs produced fit entirely in the line. */ + && it->current_x < it->last_visible_x) + { it->hpos += nglyphs; row->ascent = max (row->ascent, it->max_ascent); row->height = max (row->height, it->max_ascent + it->max_descent); -- cgit v1.2.3