commit c19fd917be656b127c5619080f866a23ce1fe755
author Bram Moolenaar <Bram@vim.org> Thu Jul 02 20:59:05 2020 +0200
committer Bram Moolenaar <Bram@vim.org> Thu Jul 02 20:59:05 2020 +0200
tree 537d23f991ec2df6922728152200b0f490f6763e
parent 1112c0febb509d0cb219f3a2479fd36833507167

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

diff --git a/src/testdir/test_iminsert.vim b/src/testdir/test_iminsert.vim
index 1f19412..80088c3 100644
--- a/src/testdir/test_iminsert.vim
+++ b/src/testdir/test_iminsert.vim
@@ -27,7 +27,7 @@
   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 @@
   elseif !has('gui_mac')
     CheckFeature xim
   endif
-  if has('gui_win32')
+  if has('win32') && has('gui_running')
     set imactivatefunc=
     set imstatusfunc=
   else

src/version.c

diff --git a/src/version.c b/src/version.c
index 06d1bed..fa8c639 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1115,
+/**/
     1114,
 /**/
     1113,