summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_terminal.vim14
-rw-r--r--src/version.c2
2 files changed, 12 insertions, 4 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 82459f85d..42b89fc9e 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -2088,16 +2088,22 @@ func Test_terminal_getwinpos()
endfunc
func Test_terminal_altscreen()
- CheckUnix
+ if has('win32')
+ let cmd = "type Xtext\<CR>"
+ else
+ let cmd = "cat Xtext\<CR>"
+ endif
let buf = term_start(&shell, {})
-
- call term_sendkeys(buf, 'echo "\e[?1047h"' .. "\r")
+ call writefile(["\<Esc>[?1047h"], 'Xtext')
+ call term_sendkeys(buf, cmd)
call WaitForAssert({-> assert_equal(1, term_getaltscreen(buf))})
- call term_sendkeys(buf, 'echo "\e[?1047l"' .. "\r")
+ call writefile(["\<Esc>[?1047l"], 'Xtext')
+ call term_sendkeys(buf, cmd)
call WaitForAssert({-> assert_equal(0, term_getaltscreen(buf))})
call term_sendkeys(buf, "exit\r")
exe buf . "bwipe!"
+ call delete('Xtext')
endfunc
diff --git a/src/version.c b/src/version.c
index 448407fdf..962f0a9a9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2015,
+/**/
2014,
/**/
2013,