patch 8.1.2410: MS-Windows: test_iminsert fails without IME support

Problem:    MS-Windows: test_iminsert fails without IME support.
Solution:   Skip the test when imgetstatus() doesn't work.

diff --git a/src/testdir/test_iminsert.vim b/src/testdir/test_iminsert.vim
index 9316ff63af7a71cc2fdf78ba3a21474f1127a835..fb2ef053bdeb01e4b37a6e9d2bd254dbe2a847b3 100644 (file)
--- a/src/testdir/test_iminsert.vim
+++ b/src/testdir/test_iminsert.vim
@@ -1,4 +1,5 @@
 source view_util.vim
+source check.vim
 
 let s:imactivatefunc_called = 0
 let s:imstatusfunc_called = 0
@@ -31,7 +32,12 @@ func Test_iminsert2()
   call assert_equal(expected, s:imstatusfunc_called)
 endfunc
 
-func Test_imgetstatus()
+func Test_getimstatus()
+  if has('win32')
+    CheckFeature multi_byte_ime
+  elseif !has('gui_mac')
+    CheckFeature xim
+  endif
   if has('gui_running')
     if !has('win32')
       throw 'Skipped: running in the GUI, only works on MS-Windows'

diff --git a/src/version.c b/src/version.c
index b11a6c7e9961863f1883914ffee39f3f5b64f935..46468e72a8ca0965e16dace58771727885d59999 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2410,
 /**/
     2409,
 /**/