(display_line): Don't treat a newline as fitting

on the line.

diff --git a/src/ChangeLog b/src/ChangeLog
index 929096d98eed6d2c956d293706e84af41c635371..76c2161b2bda6807b16bdad2cfd19cebb4dc3743 100644 (file)
--- 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 a8803c077ca2629bd1b30dfdc312bdc6712fd546..dffef44f487463b681e5818c477d7305c2255da9 100644 (file)
--- 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);