(display_line): Don't treat a newline as fitting
on the line.
This commit is contained in:
parent
2ce72bfaf9
commit
4dcd74e647
2 changed files with 10 additions and 3 deletions
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Add table
Reference in a new issue