(displayed_window_lines): Detect partially

visible lines at the bottom correctly.

diff --git a/src/ChangeLog b/src/ChangeLog
index 728d0f51a8a9b8201bb6266cadb8a3c9bb9dcd8b..e49e7b346cefaa2761cb1a4e590e8777bd2e3705 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-06  Gerd Moellmann  <gerd@gnu.org>
+
+       * window.c (displayed_window_lines): Detect partially
+       visible lines at the bottom correctly.
+
 2000-11-06  Stefan Monnier  <monnier@cs.yale.edu>
 
        * fileio.c (Fwrite_region): Use `visiting' rather than `visit'

diff --git a/src/window.c b/src/window.c
index 12b15424c2858efffeab98164bf6b9802d0ccf7e..4a4fecae574cbe18f5ec848b1fa3050efc0ace13 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -4351,7 +4351,8 @@ displayed_window_lines (w)
       int lines = (rest + CANON_Y_UNIT (f) - 1) / CANON_Y_UNIT (f);
       it.vpos += lines;
     }
-  else if (bottom_y > height)
+  else if (it.current_y < height && bottom_y > height)
+    /* Partially visible line at the bottom.  */
     ++it.vpos;
   
   return it.vpos;