diff options
| author | Kenichi Handa | 2012-11-23 23:36:24 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-11-23 23:36:24 +0900 |
| commit | 2aaec2d9be5cec44ea3b59cba476fd3e091f2fc9 (patch) | |
| tree | 3711b97807201b7eeaa066003b1c3a4ce929e5bb /src/msdos.c | |
| parent | e1d276cbf9e18f13101328f56bed1a1c0a66e63a (diff) | |
| parent | e7d0e5ee247a155a268ffbf80bedbe25e15b5032 (diff) | |
| download | emacs-2aaec2d9be5cec44ea3b59cba476fd3e091f2fc9.tar.gz emacs-2aaec2d9be5cec44ea3b59cba476fd3e091f2fc9.zip | |
Diffstat (limited to 'src/msdos.c')
| -rw-r--r-- | src/msdos.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/msdos.c b/src/msdos.c index dd05a8b2c5d..433bf1074d8 100644 --- a/src/msdos.c +++ b/src/msdos.c | |||
| @@ -1275,7 +1275,6 @@ IT_update_begin (struct frame *f) | |||
| 1275 | hlinfo->mouse_face_beg_row = hlinfo->mouse_face_beg_col = -1; | 1275 | hlinfo->mouse_face_beg_row = hlinfo->mouse_face_beg_col = -1; |
| 1276 | hlinfo->mouse_face_end_row = hlinfo->mouse_face_end_col = -1; | 1276 | hlinfo->mouse_face_end_row = hlinfo->mouse_face_end_col = -1; |
| 1277 | hlinfo->mouse_face_window = Qnil; | 1277 | hlinfo->mouse_face_window = Qnil; |
| 1278 | hlinfo->mouse_face_deferred_gc = 0; | ||
| 1279 | hlinfo->mouse_face_mouse_frame = NULL; | 1278 | hlinfo->mouse_face_mouse_frame = NULL; |
| 1280 | } | 1279 | } |
| 1281 | 1280 | ||
| @@ -1295,21 +1294,10 @@ IT_update_end (struct frame *f) | |||
| 1295 | static void | 1294 | static void |
| 1296 | IT_frame_up_to_date (struct frame *f) | 1295 | IT_frame_up_to_date (struct frame *f) |
| 1297 | { | 1296 | { |
| 1298 | Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f); | ||
| 1299 | Lisp_Object new_cursor, frame_desired_cursor; | 1297 | Lisp_Object new_cursor, frame_desired_cursor; |
| 1300 | struct window *sw; | 1298 | struct window *sw; |
| 1301 | 1299 | ||
| 1302 | if (hlinfo->mouse_face_deferred_gc | 1300 | FRAME_MOUSE_UPDATE (f); |
| 1303 | || (f && f == hlinfo->mouse_face_mouse_frame)) | ||
| 1304 | { | ||
| 1305 | block_input (); | ||
| 1306 | if (hlinfo->mouse_face_mouse_frame) | ||
| 1307 | note_mouse_highlight (hlinfo->mouse_face_mouse_frame, | ||
| 1308 | hlinfo->mouse_face_mouse_x, | ||
| 1309 | hlinfo->mouse_face_mouse_y); | ||
| 1310 | hlinfo->mouse_face_deferred_gc = 0; | ||
| 1311 | unblock_input (); | ||
| 1312 | } | ||
| 1313 | 1301 | ||
| 1314 | /* Set the cursor type to whatever they wanted. In a minibuffer | 1302 | /* Set the cursor type to whatever they wanted. In a minibuffer |
| 1315 | window, we want the cursor to appear only if we are reading input | 1303 | window, we want the cursor to appear only if we are reading input |
| @@ -1849,7 +1837,6 @@ internal_terminal_init (void) | |||
| 1849 | FRAME_BACKGROUND_PIXEL (SELECTED_FRAME ()) = colors[1]; | 1837 | FRAME_BACKGROUND_PIXEL (SELECTED_FRAME ()) = colors[1]; |
| 1850 | } | 1838 | } |
| 1851 | the_only_display_info.mouse_highlight.mouse_face_mouse_frame = NULL; | 1839 | the_only_display_info.mouse_highlight.mouse_face_mouse_frame = NULL; |
| 1852 | the_only_display_info.mouse_highlight.mouse_face_deferred_gc = 0; | ||
| 1853 | the_only_display_info.mouse_highlight.mouse_face_beg_row = | 1840 | the_only_display_info.mouse_highlight.mouse_face_beg_row = |
| 1854 | the_only_display_info.mouse_highlight.mouse_face_beg_col = -1; | 1841 | the_only_display_info.mouse_highlight.mouse_face_beg_col = -1; |
| 1855 | the_only_display_info.mouse_highlight.mouse_face_end_row = | 1842 | the_only_display_info.mouse_highlight.mouse_face_end_row = |