summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_suspend.vim8
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 0 deletions
diff --git a/src/testdir/test_suspend.vim b/src/testdir/test_suspend.vim
index ebefdd00d0..c96a1a6a8f 100644
--- a/src/testdir/test_suspend.vim
+++ b/src/testdir/test_suspend.vim
@@ -23,6 +23,10 @@ func Test_suspend()
CheckExecutable /bin/sh
call WaitForResponses()
+ if has('mac')
+ " Mac OS machines tend to be slow, wait a bit longer
+ sleep 150m
+ endif
" in case a previous failure left a swap file behind
call delete('.Xfoo.swp')
@@ -73,6 +77,10 @@ func Test_suspend_autocmd()
CheckExecutable /bin/sh
call WaitForResponses()
+ if has('mac')
+ " Mac OS machines tend to be slow, wait a bit longer
+ sleep 150m
+ endif
" in case a previous failure left a swap file behind
call delete('.Xfoo.swp')
diff --git a/src/version.c b/src/version.c
index 33a7bf8e82..9f400f2322 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1006,
+/**/
1005,
/**/
1004,