diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-09-08 22:35:48 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-09-08 22:35:48 +0200 |
| commit | bf9a3b0164e649b357d6218b4358208288b6fb7e (patch) | |
| tree | 32ce3616dbed5646659227ce919480253a3f8e16 | |
| parent | b9c79cf5cc876ba4d46d938ad4a15800dbe45e64 (diff) | |
| download | vim-git-bf9a3b0164e649b357d6218b4358208288b6fb7e.tar.gz | |
patch 8.1.2015: terminal altscreen test still fails sometimesv8.1.2015
Problem: Terminal altscreen test still fails sometimes.
Solution: Write the escape sequence in a file.
| -rw-r--r-- | src/testdir/test_terminal.vim | 14 | ||||
| -rw-r--r-- | 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 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, |