From c19fd917be656b127c5619080f866a23ce1fe755 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 2 Jul 2020 20:59:05 +0200 Subject: [PATCH] patch 8.2.1115: iminsert test fails when compiled with VIMDLL Problem: Iminsert test fails when compiled with VIMDLL. Solution: Change condition. (Ken Takata, closes #6376) --- src/testdir/test_iminsert.vim | 4 ++-- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/testdir/test_iminsert.vim b/src/testdir/test_iminsert.vim index 1f1941278..80088c3c0 100644 --- a/src/testdir/test_iminsert.vim +++ b/src/testdir/test_iminsert.vim @@ -27,7 +27,7 @@ func Test_iminsert2() set imactivatefunc= set imstatusfunc= - let expected = has('gui_win32') ? 0 : 1 + let expected = (has('win32') && has('gui_running')) ? 0 : 1 call assert_equal(expected, s:imactivatefunc_called) call assert_equal(expected, s:imstatusfunc_called) endfunc @@ -38,7 +38,7 @@ func Test_getimstatus() elseif !has('gui_mac') CheckFeature xim endif - if has('gui_win32') + if has('win32') && has('gui_running') set imactivatefunc= set imstatusfunc= else diff --git a/src/version.c b/src/version.c index 06d1bed4e..fa8c63955 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1115, /**/ 1114, /**/ -- 2.50.1