upstream

1 files changed, 8 insertions, 0 deletions

diff --git a/src/window.c b/src/window.c
index a3b58d648a1..b50ae71df8c 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3888,6 +3888,8 @@ Signal an error when WINDOW is the only window on its frame.  */)
       && EQ (r->new_total, (horflag ? r->total_cols : r->total_lines)))
     /* We can delete WINDOW now.  */
     {
+      Mouse_HLInfo *hlinfo;
+
       /* Block input.  */
       BLOCK_INPUT;
 #ifdef HAVE_XWIDGETS
@@ -3895,6 +3897,12 @@ Signal an error when WINDOW is the only window on its frame.  */)
 #endif
       window_resize_apply (p, horflag);
 
+      /* If this window is referred to by the dpyinfo's mouse
+         highlight, invalidate that slot to be safe (Bug#9904).  */
+      hlinfo = MOUSE_HL_INFO (XFRAME (w->frame));
+      if (EQ (hlinfo->mouse_face_window, window))
+        hlinfo->mouse_face_window = Qnil;
+
       windows_or_buffers_changed++;
       Vwindow_list = Qnil;
       FRAME_WINDOW_SIZES_CHANGED (f) = 1;