Commit 21323706 authored by Richard M. Stallman's avatar Richard M. Stallman

(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.
parent 01b9f355
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment