(Fmove_to_window_line): Skip past any partially visible first line.

diff --git a/src/window.c b/src/window.c
index 3467be7eddaefbb40dc743c54f4bc3825333ff20..223ef072386c0c684b3dbf7172b795f9292987e1 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -4482,12 +4482,7 @@ displayed_window_lines (w)
       int lines = (rest + CANON_Y_UNIT (f) - 1) / CANON_Y_UNIT (f);
       it.vpos += lines;
     }
-#if 0
-  else if (it.current_y < height && bottom_y > height)
-    /* Partially visible line at the bottom.  */
-    ++it.vpos;
-#endif
-  
+
   return it.vpos;
 }
 
@@ -4529,6 +4524,10 @@ zero means top of window, negative means relative to bottom of window.")
        XSETINT (arg, XINT (arg) + lines);
     }
 
+  if (w->vscroll)
+    /* Skip past a partially visible first line.  */
+    XSETINT (arg, XINT (arg) + 1);
+
   return Fvertical_motion (arg, window);
 }