To: vim_dev@googlegroups.com Subject: Patch 8.1.2410 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.2410 Problem: MS-Windows: test_iminsert fails without IME support. Solution: Skip the test when imgetstatus() doesn't work. Files: src/testdir/test_iminsert.vim *** ../vim-8.1.2409/src/testdir/test_iminsert.vim 2019-09-07 15:03:00.657670286 +0200 --- src/testdir/test_iminsert.vim 2019-12-07 21:40:17.915722690 +0100 *************** *** 1,4 **** --- 1,5 ---- source view_util.vim + source check.vim let s:imactivatefunc_called = 0 let s:imstatusfunc_called = 0 *************** *** 31,37 **** call assert_equal(expected, s:imstatusfunc_called) endfunc ! func Test_imgetstatus() if has('gui_running') if !has('win32') throw 'Skipped: running in the GUI, only works on MS-Windows' --- 32,43 ---- call assert_equal(expected, s:imstatusfunc_called) endfunc ! func Test_getimstatus() ! if has('win32') ! CheckFeature multi_byte_ime ! elseif !has('gui_mac') ! CheckFeature xim ! endif if has('gui_running') if !has('win32') throw 'Skipped: running in the GUI, only works on MS-Windows' *** ../vim-8.1.2409/src/version.c 2019-12-07 21:01:37.210026818 +0100 --- src/version.c 2019-12-07 21:36:47.337364535 +0100 *************** *** 744,745 **** --- 744,747 ---- { /* Add new patch number below this line */ + /**/ + 2410, /**/ -- hundred-and-one symptoms of being an internet addict: 221. Your wife melts your keyboard in the oven. /// 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 ///