From 21323706226d50cf5ce8aad5ae3d2bd952685f2a Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Mon, 2 Mar 1998 18:53:21 +0000 Subject: [PATCH] (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. --- src/xterm.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/xterm.c b/src/xterm.c index e910de5b281..9d8e40b7de6 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -421,9 +421,10 @@ XTframe_up_to_date (f) 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 @@ x_destroy_window (f) 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; -- 2.39.2