diff options
author | Gerd Moellmann <gerd@gnu.org> | 2001-01-27 12:40:49 +0000 |
---|---|---|
committer | Gerd Moellmann <gerd@gnu.org> | 2001-01-27 12:40:49 +0000 |
commit | 4dcd74e647a3843982238edfe19f8f390d9e47b7 (patch) | |
tree | efc96f20a2dd1b04939ff7f49f705ec7b3cf7df8 | |
parent | 2ce72bfaf9a12231843f17dad9cdc8c5109401c8 (diff) | |
download | emacs-4dcd74e647a3843982238edfe19f8f390d9e47b7.tar.gz |
(display_line): Don't treat a newline as fitting
on the line.
-rw-r--r-- | src/ChangeLog | 5 | ||||
-rw-r--r-- | 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 <gerd@gnu.org> + + * xdisp.c (display_line): Don't treat a newline as fitting + on the line. + 2001-01-26 Gerd Moellmann <gerd@gnu.org> * 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); |