To: vim_dev@googlegroups.com Subject: Patch 8.2.1115 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1115 Problem: Iminsert test fails when compiled with VIMDLL. Solution: Change condition. (Ken Takata, closes #6376) Files: src/testdir/test_iminsert.vim *** ../vim-8.2.1114/src/testdir/test_iminsert.vim 2020-07-01 15:12:39.715774200 +0200 --- src/testdir/test_iminsert.vim 2020-07-02 20:52:12.715014140 +0200 *************** *** 27,33 **** set imactivatefunc= set imstatusfunc= ! let expected = has('gui_win32') ? 0 : 1 call assert_equal(expected, s:imactivatefunc_called) call assert_equal(expected, s:imstatusfunc_called) endfunc --- 27,33 ---- set imactivatefunc= set imstatusfunc= ! 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,44 **** elseif !has('gui_mac') CheckFeature xim endif ! if has('gui_win32') set imactivatefunc= set imstatusfunc= else --- 38,44 ---- elseif !has('gui_mac') CheckFeature xim endif ! if has('win32') && has('gui_running') set imactivatefunc= set imstatusfunc= else *** ../vim-8.2.1114/src/version.c 2020-07-01 21:53:33.411476027 +0200 --- src/version.c 2020-07-02 20:58:30.812771677 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1115, /**/ -- "The future's already arrived - it's just not evenly distributed yet." -- William Gibson /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///