(start_display): Set it->first_vpos.

(try_window_id): Use first_vpos to start display in first _text_
line if no reusable lines at start of window with header line.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index 8b026fefa9e..4a32cea2b6e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2201,6 +2201,7 @@ start_display (it, w, pos)
 
   row = w->desired_matrix->rows + first_vpos;
   init_iterator (it, w, CHARPOS (pos), BYTEPOS (pos), row, DEFAULT_FACE_ID);
+  it->first_vpos = first_vpos;
 
   if (!it->truncate_lines_p)
     {
@@ -13092,8 +13093,9 @@ try_window_id (w)
   else
     {
       /* There are no reusable lines at the start of the window.
-         Start displaying in the first line.  */
+         Start displaying in the first text line.  */
       start_display (&it, w, start);
+      it.vpos = it.first_vpos;
       start_pos = it.current.pos;
     }