Merge remote-tracking branch 'origin/master' into feature/android

2 files changed, 9 insertions, 2 deletions

diff --git a/src/pdumper.c b/src/pdumper.c
index 04e3b66b0c2..7e6047e6a95 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -2178,7 +2178,7 @@ dump_interval_node (struct dump_context *ctx, struct itree_node *node,
 static dump_off
 dump_overlay (struct dump_context *ctx, const struct Lisp_Overlay *overlay)
 {
-#if CHECK_STRUCTS && !defined (HASH_Lisp_Overlay_EB4C05D8D2)
+#if CHECK_STRUCTS && !defined (HASH_Lisp_Overlay_5F9D7E02FC)
 # error "Lisp_Overlay changed. See CHECK_STRUCTS comment in config.h."
 #endif
   START_DUMP_PVEC (ctx, &overlay->header, struct Lisp_Overlay, out);
diff --git a/src/xdisp.c b/src/xdisp.c
index ae9152847c1..174947c7f7e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17661,7 +17661,14 @@ mark_window_display_accurate_1 (struct window *w, bool accurate_p)
         report_point_change (WINDOW_XFRAME (w), w, b);
 #endif /* HAVE_TEXT_CONVERSION */
 
-      w->window_end_valid = true;
+      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;
     }