2 files changed, 7 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d6fd3dfc20d..6096177d1f0 100644
--- 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 c2ed64b1477..e75ae762687 100644
--- 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;