(displayed_window_lines): Correct for one-off bug

in HEIGHT on non-window displays.

diff --git a/src/window.c b/src/window.c
index 616afd6bc516bbc3684699ffd65c734231974e2d..c629a30cb7dd32415c3cb13c5178f0bf9688ac65 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -4653,6 +4653,15 @@ displayed_window_lines (w)
   move_it_vertically (&it, height);
   bottom_y = line_bottom_y (&it);
 
+  /* rms: On a non-window display,
+     the value of it.vpos at the bottom of the screen
+     seems to be 1 larger than window_box_height (w).
+     This kludge fixes a bug whereby (move-to-window-line -1)
+     when ZV is on the last screen line
+     moves to the previous screen line instead of the last one.  */
+  if (! FRAME_WINDOW_P (XFRAME (w->frame)))
+    height++;
+
   /* Add in empty lines at the bottom of the window.  */
   if (bottom_y < height)
     {