summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_terminal.vim4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 4cd77572eb..41a0a45003 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -580,6 +580,10 @@ func Test_terminal_write_stdin()
if !executable('wc')
throw 'skipped: wc command not available'
endif
+ if has('win32')
+ " TODO: enable once writing to stdin works on MS-Windows
+ return
+ endif
new
call setline(1, ['one', 'two', 'three'])
%term wc
diff --git a/src/version.c b/src/version.c
index 4d9696bc58..70fd603354 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 29,
+/**/
28,
/**/
27,