Mercurial > emacs
changeset 35641:369c647a5ed5
(display_line): Don't treat a newline as fitting
on the line.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Sat, 27 Jan 2001 12:40:20 +0000 |
| parents | 6ed788afc91f |
| children | 15b0b31760c7 |
| files | src/xdisp.c |
| diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xdisp.c Sat Jan 27 12:30:56 2001 +0000 +++ b/src/xdisp.c Sat Jan 27 12:40:20 2001 +0000 @@ -12229,10 +12229,12 @@ 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);