From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 25 Nov 2017 16:58:28 +0000 (+0100)
Subject: patch 8.0.1341: 'imactivatefunc' test fails on MS-Windows
X-Git-Tag: v8.0.1341
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be5d998d0ea2226f1f7180c32b19df17ad674853;p=vim

patch 8.0.1341: 'imactivatefunc' test fails on MS-Windows

Problem:    'imactivatefunc' test fails on MS-Windows.
Solution:   Skip the text.
---

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index d71e7f9c4..3888d9f42 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4259,6 +4259,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			{only available when compiled with |+mbyte|}
 	This option specifies a function that will be called to
 	activate/inactivate Input Method.
+	Does not work in the MS-Windows GUI version.
 
 	Example: >
 		function ImActivateFunc(active)
@@ -4374,6 +4375,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			{only available when compiled with |+mbyte|}
 	This option specifies a function that is called to obtain the status
 	of Input Method.  It must return a positive number when IME is active.
+	Does not work in the MS-Windows GUI version.
 
 	Example: >
 		function ImStatusFunc()
diff --git a/src/testdir/test_iminsert.vim b/src/testdir/test_iminsert.vim
index 603135af2..0676c03f1 100644
--- a/src/testdir/test_iminsert.vim
+++ b/src/testdir/test_iminsert.vim
@@ -17,6 +17,9 @@ func IM_statusfunc()
 endfunc
 
 func Test_iminsert2()
+  if has('gui_win32')
+    return
+  endif
   set imactivatefunc=IM_activatefunc
   set imstatusfunc=IM_statusfunc
   set iminsert=2
diff --git a/src/version.c b/src/version.c
index e391e5297..3fa66e492 100644
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1341,
 /**/
     1340,
 /**/