Mercurial > vim

changeset 21128:484c27f2e98c v8.2.1115

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1115: iminsert test fails when compiled with VIMDLL Commit: https://github.com/vim/vim/commit/c19fd917be656b127c5619080f866a23ce1fe755 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jul 2 20:59:05 2020 +0200 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 https://github.com/vim/vim/issues/6376)
author Bram Moolenaar <Bram@vim.org>
date Thu, 02 Jul 2020 21:15:04 +0200
parents b68f941f9cc2
children 9a40ce00f714
files src/testdir/test_iminsert.vim src/version.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1115,
+/**/
     1114,
 /**/
     1113,