Mercurial > vim

changeset 29171:72140c10875f v8.2.5105

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.5105: test still hangs on MS-Windows Commit: https://github.com/vim/vim/commit/83497f875881973df772cc4cc593766345df6c4a Author: Bram Moolenaar <Bram@vim.org> Date: Wed Jun 15 22:11:45 2022 +0100 patch 8.2.5105: test still hangs on MS-Windows Problem: Test still hangs on MS-Windows. Solution: Skip "nocatch" test the right way.
author Bram Moolenaar <Bram@vim.org>
date Wed, 15 Jun 2022 23:15:03 +0200
parents 6adfd606564e
children d08526b7bcd4
files src/testdir/test_retab.vim src/version.c
diffstat 2 files changed, 8 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_retab.vim
+++ b/src/testdir/test_retab.vim
@@ -92,11 +92,7 @@ func RetabLoop()
 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
@@ -105,20 +101,21 @@ func Test_retab_endless()
     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
+  " 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
-  new
   call setline(1, "\t0\t")
   call assert_fails('call RetabLoop()', ['E1240:', 'Interrupted'])
 
-  bwipe!
   set tabstop&
 endfunc
 
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    5105,
+/**/
     5104,
 /**/
     5103,