patch 8.1.0782: Win32: cursor blinks when Vim is not active

Problem:    Win32: cursor blinks when Vim is not active.
Solution:   Remove call to setActiveWindow(). (Yasuhiro Matsumoto,
            closes #3778)

diff --git a/src/gui_w32.c b/src/gui_w32.c
index ceaa041b69db3c63d42f8ddf8ee8fd84c575975d..4637aa2de5a8e8139c42ea34966f7958ec1e914f 100644 (file)
--- 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 7c934ea430ca46d8031f7271eef084f63ba07435..a9cbb05d02a1037300e2441f5879efc45d0fbfe5 100644 (file)
--- 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 487549ee017830e5c8743163c0d2b9af2f3bc61c..4695fde96e13ae181189789614746f2f9d651fa2 100644 (file)
--- 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 b62aa35c18f7268a028fb25b9f0337274fadfa6d..6f8f874421adef76fb89d53f509c2a3a41f0111e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -791,6 +791,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    782,
 /**/
     781,
 /**/