From bf9a3b0164e649b357d6218b4358208288b6fb7e Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 8 Sep 2019 22:35:48 +0200 Subject: [PATCH] patch 8.1.2015: terminal altscreen test still fails sometimes Problem: Terminal altscreen test still fails sometimes. Solution: Write the escape sequence in a file. --- src/testdir/test_terminal.vim | 14 ++++++++++---- src/version.c | 2 ++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index 82459f85db..42b89fc9ef 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\" + else + let cmd = "cat Xtext\" + endif let buf = term_start(&shell, {}) - - call term_sendkeys(buf, 'echo "\e[?1047h"' .. "\r") + call writefile(["\[?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(["\[?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 448407fdf4..962f0a9a97 100644 --- a/src/version.c +++ b/src/version.c @@ -757,6 +757,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2015, /**/ 2014, /**/ -- 2.47.3