; * src/xdisp.c (mark_window_display_accurate_1): Avoid more aborts.

diff --git a/src/xdisp.c b/src/xdisp.c
index 8a6e2b0f6d677e109eadb9f6681786c2468d92d0..e061b602e0d2b6c39a4c156f5796a0183b5ad4c9 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17498,7 +17498,13 @@ mark_window_display_accurate_1 (struct window *w, bool accurate_p)
       else
        w->last_point = marker_position (w->pointm);
 
-      if (w->window_end_vpos < w->current_matrix->nrows)
+      struct glyph_row *row;
+      /* These conditions should be consistent with CHECK_WINDOW_END.  */
+      if (w->window_end_vpos < w->current_matrix->nrows
+         && ((row = MATRIX_ROW (w->current_matrix, w->window_end_vpos),
+              !row->enabled_p
+              || MATRIX_ROW_DISPLAYS_TEXT_P (row)
+              || MATRIX_ROW_VPOS (row, w->current_matrix) == 0)))
        w->window_end_valid = true;
       w->update_mode_line = false;
       w->preserve_vscroll_p = false;