diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-01-19 19:54:20 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-01-19 19:54:20 +0100 |
| commit | 2d951a486e632f99fe039c0b0a1685f1fe7879b2 (patch) | |
| tree | a66e908c923cb82fa7e4b1577e20ea756949767f | |
| parent | a502caab8bd396316a6eb5cb821b0a0df55c502a (diff) | |
| download | vim-git-2d951a486e632f99fe039c0b0a1685f1fe7879b2.tar.gz | |
patch 8.1.0782: Win32: cursor blinks when Vim is not activev8.1.0782
Problem: Win32: cursor blinks when Vim is not active.
Solution: Remove call to setActiveWindow(). (Yasuhiro Matsumoto,
closes #3778)
| -rw-r--r-- | src/gui_w32.c | 6 | ||||
| -rw-r--r-- | src/menu.c | 5 | ||||
| -rw-r--r-- | src/proto/gui_w32.pro | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 2 insertions, 12 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c index ceaa041b6..4637aa2de 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -2442,12 +2442,6 @@ CenterWindow( } #endif /* FEAT_GUI_DIALOG */ -void -gui_mch_activate_window(void) -{ - (void)SetActiveWindow(s_hwnd); -} - #if defined(FEAT_TOOLBAR) || defined(PROTO) void gui_mch_show_toolbar(int showit) diff --git a/src/menu.c b/src/menu.c index 7c934ea43..a9cbb05d0 100644 --- a/src/menu.c +++ b/src/menu.c @@ -2080,11 +2080,6 @@ gui_update_menus(int modes) gui_mch_draw_menubar(); prev_mode = mode; force_menu_update = FALSE; -# ifdef FEAT_GUI_W32 - /* This can leave a tearoff as active window - make sure we - * have the focus <negri>*/ - gui_mch_activate_window(); -# endif } } diff --git a/src/proto/gui_w32.pro b/src/proto/gui_w32.pro index 487549ee0..4695fde96 100644 --- a/src/proto/gui_w32.pro +++ b/src/proto/gui_w32.pro @@ -36,7 +36,6 @@ void gui_mch_set_menu_pos(int x, int y, int w, int h); void gui_mch_menu_hidden(vimmenu_T *menu, int hidden); void gui_mch_draw_menubar(void); guicolor_T gui_mch_get_rgb(guicolor_T pixel); -void gui_mch_activate_window(void); void gui_mch_show_toolbar(int showit); void gui_mch_show_tabline(int showit); int gui_mch_showing_tabline(void); diff --git a/src/version.c b/src/version.c index b62aa35c1..6f8f87442 100644 --- a/src/version.c +++ b/src/version.c @@ -792,6 +792,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 782, +/**/ 781, /**/ 780, |