aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.1115: iminsert test fails when compiled with VIMDLL

Browse Source 
Problem:    Iminsert test fails when compiled with VIMDLL.
Solution:   Change condition. (Ken Takata, closes #6376)
This commit is contained in:
Bram Moolenaar 2020-07-02 20:59:05 +02:00
parent 1112c0febb
commit c19fd917be
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/testdir/test_iminsert.vim
View File

@ -27,7 +27,7 @@ func Test_iminsert2()
set imactivatefunc= set imactivatefunc=
set imstatusfunc= 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:imactivatefunc_called)
call assert_equal(expected, s:imstatusfunc_called) call assert_equal(expected, s:imstatusfunc_called)
endfunc endfunc
@ -38,7 +38,7 @@ func Test_getimstatus()
elseif !has('gui_mac') elseif !has('gui_mac')
CheckFeature xim CheckFeature xim
endif endif
if has('gui_win32') if has('win32') && has('gui_running')
set imactivatefunc= set imactivatefunc=
set imstatusfunc= set imstatusfunc=
else else

2
src/version.c
View File

@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1115,
/**/ /**/
1114, 1114,
/**/ /**/