diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-11-25 17:58:28 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-11-25 17:58:28 +0100 |
| commit | be5d998d0ea2226f1f7180c32b19df17ad674853 (patch) | |
| tree | 200aafeba36fdc733c798619a93862d0061c83ee | |
| parent | 281c93e7140ba87552c4edcbfdaaa5e25dc6a97a (diff) | |
patch 8.0.1341: 'imactivatefunc' test fails on MS-Windowsv8.0.1341
Problem: 'imactivatefunc' test fails on MS-Windows.
Solution: Skip the text.
| -rw-r--r-- | runtime/doc/options.txt | 2 | ||||
| -rw-r--r-- | src/testdir/test_iminsert.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index d71e7f9c46..3888d9f426 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 603135af29..0676c03f16 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 e391e52974..3fa66e4921 100644 --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1341, +/**/ 1340, /**/ 1339, |