summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_terminal.vim7
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index f2586e1569..58949a4646 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -1660,7 +1660,12 @@ func Test_terminal_hidden_and_close()
endfunc
func Test_terminal_does_not_truncate_last_newlines()
- let cmd = has('win32') ? 'type' : 'cat'
+ " FIXME: currently doens't work for Windows
+ if has('win32')
+ return
+ endif
+
+ let cmd = 'cat'
let contents = [
\ [ 'One', '', 'X' ],
\ [ 'Two', '', '' ],
diff --git a/src/version.c b/src/version.c
index 0ab7166cd3..1edb1d2dd8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 524,
+/**/
523,
/**/
522,