To: vim_dev@googlegroups.com Subject: Patch 8.2.1836 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1836 Problem: Autocmd test fails on pacifist systems. Solution: Check that /bin/kill exists. (James McCoy, closes #7117) Tune the timing, make the autocmd test run faster. Files: src/testdir/test_autocmd.vim *** ../vim-8.2.1835/src/testdir/test_autocmd.vim 2020-09-23 22:38:01.503927513 +0200 --- src/testdir/test_autocmd.vim 2020-10-11 20:06:38.905007139 +0200 *************** *** 30,36 **** call writefile(before, 'Xinit') let buf = RunVimInTerminal('-S Xinit Xfile', {}) call term_sendkeys(buf, "G") ! call term_wait(buf, 20) call term_sendkeys(buf, "gg") call term_wait(buf) call WaitForAssert({-> assert_equal(['1'], readfile('Xoutput')[-1:-1])}) --- 30,36 ---- call writefile(before, 'Xinit') let buf = RunVimInTerminal('-S Xinit Xfile', {}) call term_sendkeys(buf, "G") ! call term_wait(buf, 50) call term_sendkeys(buf, "gg") call term_wait(buf) call WaitForAssert({-> assert_equal(['1'], readfile('Xoutput')[-1:-1])}) *************** *** 77,85 **** " CursorHoldI event. let g:triggered = 0 au CursorHoldI * let g:triggered += 1 ! set updatetime=500 call job_start(has('win32') ? 'cmd /c echo:' : 'echo', ! \ {'exit_cb': {-> timer_start(1000, 'ExitInsertMode')}}) call feedkeys('a', 'x!') call assert_equal(1, g:triggered) unlet g:triggered --- 77,85 ---- " CursorHoldI event. let g:triggered = 0 au CursorHoldI * let g:triggered += 1 ! set updatetime=100 call job_start(has('win32') ? 'cmd /c echo:' : 'echo', ! \ {'exit_cb': {-> timer_start(200, 'ExitInsertMode')}}) call feedkeys('a', 'x!') call assert_equal(1, g:triggered) unlet g:triggered *************** *** 452,457 **** --- 452,458 ---- mksession! let content =<< trim [CODE] + call test_override('ui_delay', 10) set nocp noswapfile let v:swapchoice="e" augroup test_autocmd_sessionload *************** *** 2421,2426 **** --- 2422,2429 ---- " Test closing a window or editing another buffer from a FileChangedRO handler " in a readonly buffer func Test_FileChangedRO_winclose() + call test_override('ui_delay', 10) + augroup FileChangedROTest au! autocmd FileChangedRO * quit *************** *** 2440,2445 **** --- 2443,2449 ---- call assert_fails('normal i', 'E788:') close augroup! FileChangedROTest + call test_override('ALL', 0) endfunc func LogACmd() *************** *** 2533,2538 **** --- 2537,2543 ---- " Tests for SigUSR1 autocmd event, which is only available on posix systems. func Test_autocmd_sigusr1() CheckUnix + CheckExecutable /bin/kill let g:sigusr1_passed = 0 au SigUSR1 * let g:sigusr1_passed = 1 *** ../vim-8.2.1835/src/version.c 2020-10-11 19:08:30.096946822 +0200 --- src/version.c 2020-10-11 19:58:40.638093348 +0200 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 1836, /**/ -- hundred-and-one symptoms of being an internet addict: 65. The last time you looked at the clock it was 11:30pm, and in what seems like only a few seconds later, your sister runs past you to catch her 7am school bus. /// 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 ///