merge from upstream. currently seems to have bitroted and i get segfaults

[gnu-emacs] / src / dispnew.c

diff --git a/src/dispnew.c b/src/dispnew.c
index 1aef70f1a5d748c984715f38d28808073736231e..4521d0a1a6bb5993414c96330e02788792e61120 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3417,6 +3417,7 @@ update_single_window (struct window *w, int force_p)
 {
   if (w->must_be_updated_p)
     {
+      printf("window %d must be updated\n");
       struct frame *f = XFRAME (WINDOW_FRAME (w));
 
       /* Record that this is not a frame-based redisplay.  */
@@ -3770,6 +3771,10 @@ update_window (struct window *w, int force_p)
   add_window_display_history (w, w->current_matrix->method, paused_p);
 #endif
 
+  
+  if ((XWINDOW(FRAME_SELECTED_WINDOW (SELECTED_FRAME()))) ==  (w))
+    xwidget_end_redisplay(w->current_matrix);
+  
   clear_glyph_matrix (desired_matrix);
 
   return paused_p;