From e2a3f36bf22bfa00343c6a7aaef5337a9dfc0993 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 7 Dec 2019 21:40:48 +0100 Subject: [PATCH] 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. --- src/testdir/test_iminsert.vim | 8 +++++++- src/version.c | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_iminsert.vim b/src/testdir/test_iminsert.vim index 9316ff63a..fb2ef053b 100644 --- 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 b11a6c7e9..46468e72a 100644 --- 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, /**/ -- 2.40.0