To: vim_dev@googlegroups.com Subject: Patch 8.2.0476 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0476 Problem: Terminal nasty callback test fails sometimes. Solution: use term_wait() instead of a sleep. (Yee Cheng Chin,closes #5865) Files: src/testdir/test_terminal.vim *** ../vim-8.2.0475/src/testdir/test_terminal.vim 2020-03-26 20:33:20.999063758 +0100 --- src/testdir/test_terminal.vim 2020-03-29 17:47:39.315728834 +0200 *************** *** 2536,2552 **** let g:buf1 = term_start('sh', #{hidden: 1, term_finish: 'close'}) call popup_create(g:buf1, {}) let g:buf2 = term_start(['sh', '-c'], #{curwin: 1, exit_cb: function('TermExit')}) ! sleep 100m call popup_close(win_getid()) endfunc func TermExit(...) ! call term_sendkeys(bufnr('#'), "exit\") call popup_close(win_getid()) endfunc call OpenTerms() call term_sendkeys(g:buf0, "exit\") ! sleep 100m exe g:buf0 .. 'bwipe!' set hidden& endfunc --- 2536,2554 ---- let g:buf1 = term_start('sh', #{hidden: 1, term_finish: 'close'}) call popup_create(g:buf1, {}) let g:buf2 = term_start(['sh', '-c'], #{curwin: 1, exit_cb: function('TermExit')}) ! call term_wait(g:buf2, 100) call popup_close(win_getid()) endfunc func TermExit(...) ! let altbuf = bufnr('#') ! call term_sendkeys(altbuf, "exit\") ! call term_wait(altbuf) call popup_close(win_getid()) endfunc call OpenTerms() call term_sendkeys(g:buf0, "exit\") ! call term_wait(g:buf0, 100) exe g:buf0 .. 'bwipe!' set hidden& endfunc *** ../vim-8.2.0475/src/version.c 2020-03-29 16:18:55.226422995 +0200 --- src/version.c 2020-03-29 17:48:37.747517710 +0200 *************** *** 740,741 **** --- 740,743 ---- { /* Add new patch number below this line */ + /**/ + 476, /**/ -- Life is a gift, living is an art. (Bram Moolenaar) /// 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 ///