summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_channel.vim10
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 2 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 9f52eb77e..a0532ca46 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -191,7 +191,10 @@ func s:two_channels(port)
endfunc
func Test_two_channels()
- call s:run_server('s:two_channels')
+ " TODO: make this work again with MS-Windows
+ if has('unix')
+ call s:run_server('s:two_channels')
+ endf
endfunc
" Test that a server crash is handled gracefully.
@@ -208,7 +211,10 @@ func s:server_crash(port)
endfunc
func Test_server_crash()
- call s:run_server('s:server_crash')
+ " TODO: make this work again with MS-Windows
+ if has('unix')
+ call s:run_server('s:server_crash')
+ endif
endfunc
let s:reply = ""
diff --git a/src/version.c b/src/version.c
index 7a99caa10..90c507a39 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1307,
+/**/
1306,
/**/
1305,