To: vim_dev@googlegroups.com Subject: Patch 8.2.5105 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.5105 (after 8.2.5104) Problem: Test still hangs on MS-Windows. Solution: Skip "nocatch" test the right way. Files: src/testdir/test_retab.vim *** ../vim-8.2.5104/src/testdir/test_retab.vim 2022-06-15 21:28:49.611981777 +0100 --- src/testdir/test_retab.vim 2022-06-15 22:10:31.860437015 +0100 *************** *** 92,102 **** endfunc func Test_retab_endless() - " FIXME: why does this hang on MS-Windows? - CheckNotMSWindows - " inside try/catch we catch the error message - new call setline(1, "\t0\t") let caught = 'no' try --- 92,98 ---- *************** *** 105,124 **** let caught = v:exception endtry call assert_match('E1240:', caught) ! bwipe! set tabstop& endfunc func Test_nocatch_retab_endless() ! " FIXME: does this hang on MS-Windows? ! CheckNotMSWindows " not inside try/catch an interrupt is generated to get out of loops - new call setline(1, "\t0\t") call assert_fails('call RetabLoop()', ['E1240:', 'Interrupted']) - bwipe! set tabstop& endfunc --- 101,121 ---- let caught = v:exception endtry call assert_match('E1240:', caught) ! set tabstop& endfunc func Test_nocatch_retab_endless() ! " FIXME: why does this hang on MS-Windows? Is got_int reset somewhere? ! if has('win32') ! let g:skipped_reason = "does not work on MS-Windows" ! return ! endif " not inside try/catch an interrupt is generated to get out of loops call setline(1, "\t0\t") call assert_fails('call RetabLoop()', ['E1240:', 'Interrupted']) set tabstop& endfunc *** ../vim-8.2.5104/src/version.c 2022-06-15 21:28:49.611981777 +0100 --- src/version.c 2022-06-15 22:11:22.243777049 +0100 *************** *** 736,737 **** --- 736,739 ---- { /* Add new patch number below this line */ + /**/ + 5105, /**/ -- Corn oil comes from corn and olive oil comes from olives, so where does baby oil come from? /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///