[Emacs-diffs] /srv/bzr/emacs/trunk r107257: * window.c (Fdelete_window_internal): Invalidate the mouse highlight.

[Chong Yidong]

------------------------------------------------------------
revno: 107257
fixes bug(s): http://debbugs.gnu.org/9904
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2012-02-12 12:29:50 +0800
message:
  * window.c (Fdelete_window_internal): Invalidate the mouse highlight.
modified:
  src/ChangeLog
  src/window.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-02-12 03:13:13 +0000
+++ b/src/ChangeLog     2012-02-12 04:29:50 +0000
@@ -1,3 +1,8 @@
+2012-02-12  Chong Yidong  <address@hidden>
+
+       * window.c (Fdelete_window_internal): Invalidate the mouse
+       highlight (Bug#9904).
+
 2012-02-12  Glenn Morris  <address@hidden>
 
        * xselect.c (Fx_own_selection_internal)

=== modified file 'src/window.c'
--- a/src/window.c      2012-01-19 10:38:31 +0000
+++ b/src/window.c      2012-02-12 04:29:50 +0000
@@ -3886,10 +3886,18 @@
       && EQ (r->new_total, (horflag ? r->total_cols : r->total_lines)))
     /* We can delete WINDOW now.  */
     {
+      Mouse_HLInfo *hlinfo;
+
       /* Block input.  */
       BLOCK_INPUT;
       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;