diff options
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/xterm.c b/src/xterm.c index 463d82b4ee2..61e942e10d2 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -669,21 +669,7 @@ static void | |||
| 669 | XTframe_up_to_date (struct frame *f) | 669 | XTframe_up_to_date (struct frame *f) |
| 670 | { | 670 | { |
| 671 | if (FRAME_X_P (f)) | 671 | if (FRAME_X_P (f)) |
| 672 | { | 672 | FRAME_MOUSE_UPDATE (f); |
| 673 | Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f); | ||
| 674 | |||
| 675 | if (hlinfo->mouse_face_deferred_gc | ||
| 676 | || f == hlinfo->mouse_face_mouse_frame) | ||
| 677 | { | ||
| 678 | block_input (); | ||
| 679 | if (hlinfo->mouse_face_mouse_frame) | ||
| 680 | note_mouse_highlight (hlinfo->mouse_face_mouse_frame, | ||
| 681 | hlinfo->mouse_face_mouse_x, | ||
| 682 | hlinfo->mouse_face_mouse_y); | ||
| 683 | hlinfo->mouse_face_deferred_gc = 0; | ||
| 684 | unblock_input (); | ||
| 685 | } | ||
| 686 | } | ||
| 687 | } | 673 | } |
| 688 | 674 | ||
| 689 | 675 | ||
| @@ -9502,7 +9488,6 @@ x_free_frame_resources (struct frame *f) | |||
| 9502 | hlinfo->mouse_face_end_row | 9488 | hlinfo->mouse_face_end_row |
| 9503 | = hlinfo->mouse_face_end_col = -1; | 9489 | = hlinfo->mouse_face_end_col = -1; |
| 9504 | hlinfo->mouse_face_window = Qnil; | 9490 | hlinfo->mouse_face_window = Qnil; |
| 9505 | hlinfo->mouse_face_deferred_gc = 0; | ||
| 9506 | hlinfo->mouse_face_mouse_frame = 0; | 9491 | hlinfo->mouse_face_mouse_frame = 0; |
| 9507 | } | 9492 | } |
| 9508 | 9493 | ||
| @@ -10153,7 +10138,6 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) | |||
| 10153 | dpyinfo->bitmaps_last = 0; | 10138 | dpyinfo->bitmaps_last = 0; |
| 10154 | dpyinfo->scratch_cursor_gc = 0; | 10139 | dpyinfo->scratch_cursor_gc = 0; |
| 10155 | hlinfo->mouse_face_mouse_frame = 0; | 10140 | hlinfo->mouse_face_mouse_frame = 0; |
| 10156 | hlinfo->mouse_face_deferred_gc = 0; | ||
| 10157 | hlinfo->mouse_face_beg_row = hlinfo->mouse_face_beg_col = -1; | 10141 | hlinfo->mouse_face_beg_row = hlinfo->mouse_face_beg_col = -1; |
| 10158 | hlinfo->mouse_face_end_row = hlinfo->mouse_face_end_col = -1; | 10142 | hlinfo->mouse_face_end_row = hlinfo->mouse_face_end_col = -1; |
| 10159 | hlinfo->mouse_face_face_id = DEFAULT_FACE_ID; | 10143 | hlinfo->mouse_face_face_id = DEFAULT_FACE_ID; |