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)

diff --git a/src/testdir/test_iminsert.vim b/src/testdir/test_iminsert.vim
index 1f194127890d2b329590fae18b91c93bd4eb8347..80088c3c0798704f5f5311dfe3aec79f48f1c3da 100644 (file)
--- 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 06d1bed4eb88fc3add05265f300d6dfb9fa088d6..fa8c63955c58fe010d7e004cbde4303310f0b733 100644 (file)
--- 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,
 /**/