patch 8.2.5105: test still hangs on MS-Windows

Problem:    Test still hangs on MS-Windows.
Solution:   Skip "nocatch" test the right way.

diff --git a/src/testdir/test_retab.vim b/src/testdir/test_retab.vim
index 3bd8a9928ceb80fae019aac68c38d914ffde04cd..4253e77487fa67d5d7e98a33444e0e00c5ab3744 100644 (file)
--- 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
 

diff --git a/src/version.c b/src/version.c
index 1e6d82a6ab92d652f5f1eda3255cd2a7b812b740..4672f0e93757cd0333e891bb15cc1eca86674b2d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5105,
 /**/
     5104,
 /**/