# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 888864801 0
# Node ID 1ecfba12016a18cbbc08bb4fb25a82378b54929e
# Parent  f778c7136ff54b01407f4096e082e8c14f357896
(XTframe_up_to_date): Check that mouse_face_mouse_frame
is non-null before calling note_mouse_highlight.
(x_destroy_window): If f equals mouse_face_mouse_frame,
clear that, and clear mouse_face_deferred_gc too.

diff -r f778c7136ff5 -r 1ecfba12016a src/xterm.c
--- a/src/xterm.c	Mon Mar 02 18:00:00 1998 +0000
+++ b/src/xterm.c	Mon Mar 02 18:53:21 1998 +0000
@@ -421,9 +421,10 @@
   if (FRAME_X_DISPLAY_INFO (f)->mouse_face_deferred_gc
       || f == FRAME_X_DISPLAY_INFO (f)->mouse_face_mouse_frame)
     {
-      note_mouse_highlight (FRAME_X_DISPLAY_INFO (f)->mouse_face_mouse_frame,
-			    FRAME_X_DISPLAY_INFO (f)->mouse_face_mouse_x,
-			    FRAME_X_DISPLAY_INFO (f)->mouse_face_mouse_y);
+      if (FRAME_X_DISPLAY_INFO (f)->mouse_face_mouse_frame)
+	note_mouse_highlight (FRAME_X_DISPLAY_INFO (f)->mouse_face_mouse_frame,
+			      FRAME_X_DISPLAY_INFO (f)->mouse_face_mouse_x,
+			      FRAME_X_DISPLAY_INFO (f)->mouse_face_mouse_y);
       FRAME_X_DISPLAY_INFO (f)->mouse_face_deferred_gc = 0;
     }
   UNBLOCK_INPUT;
@@ -6114,6 +6115,8 @@
       dpyinfo->mouse_face_end_row
 	= dpyinfo->mouse_face_end_col = -1;
       dpyinfo->mouse_face_window = Qnil;
+      dpyinfo->mouse_face_deferred_gc = 0;
+      dpyinfo->mouse_face_mouse_frame = 0;
     }
 
   UNBLOCK_INPUT;