(pos_visible_p): Handle case that we reach ZV without

knowing the line's height; use the default font's height in that
case.

diff --git a/src/ChangeLog b/src/ChangeLog
index d6fd3dfc20d2f3f84681ee34fae01f699aa54012..6096177d1f05a5d842266e6fc6c9ad6fd784d21c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2000-11-16  Gerd Moellmann  <gerd@gnu.org>
 
+       * xdisp.c (pos_visible_p): Handle case that we reach ZV without
+       knowing the line's height; use the default font's height in that
+       case.
+
        * xfaces.c (weight_table): Add `demi' with the same meaning as
        `demibold'.
 

diff --git a/src/xdisp.c b/src/xdisp.c
index c2ed64b1477c8d8daf94cf60dd9103d6f1490d5c..e75ae762687d8567ca75e4dd87271178e92f61a3 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -995,13 +995,15 @@ pos_visible_p (w, charpos, fully, exact_mode_line_heights_p)
        {
          if (last_height)
            line_height = last_height;
-         else
+         else if (charpos < ZV)
            {
              move_it_by_lines (&it, 1, 1);
              line_height = (it.max_ascent || it.max_descent
                             ? it.max_ascent + it.max_descent
                             : last_height);
            }
+         else 
+           line_height = FONT_HEIGHT (FRAME_FONT (XFRAME (w->frame)));
        }
       line_bottom_y = line_top_y + line_height;