summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_timers.vim7
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim
index 98df6ff93..f97808c15 100644
--- a/src/testdir/test_timers.vim
+++ b/src/testdir/test_timers.vim
@@ -381,7 +381,12 @@ endfunc
" vgetc().
func Test_nocatch_timer_garbage_collect()
" FIXME: why does this fail only on MacOS M1?
- CheckNotMacM1
+ try
+ CheckNotMacM1
+ catch /Skipped/
+ let g:skipped_reason = v:exception
+ return
+ endtry
" 'uptimetime. must be bigger than the timer timeout
set ut=200
diff --git a/src/version.c b/src/version.c
index 442868712..5057877b9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 574,
+/**/
573,
/**/
572,