summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-02-05 09:38:50 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-02-05 09:39:05 +0000
commit1272de060227a31e057c18f58345e8f80bcc7a7d (patch)
treeba8300325f3c3aeba9378f216631d1df4ceabd15
parentReleasing progress-linux version 2:8.0.1451-1~dschinn1. (diff)
downloadvim-1272de060227a31e057c18f58345e8f80bcc7a7d.zip
vim-1272de060227a31e057c18f58345e8f80bcc7a7d.tar.xz
Merging upstream version 2:8.0.1453.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--src/testdir/test_terminal.vim18
-rw-r--r--src/version.c4
2 files changed, 17 insertions, 5 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 853c69c..0c2e289 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -522,7 +522,7 @@ func Test_terminal_noblock()
" On MS-Windows there is an extra empty line below "done". Find "done" in
" the last-but-one or the last-but-two line.
let lnum = term_getsize(buf)[0] - 1
- call WaitFor({-> term_getline(buf, lnum) =~ "done" || term_getline(buf, lnum - 1) =~ "done"}, 3000)
+ call WaitFor({-> term_getline(buf, lnum) =~ "done" || term_getline(buf, lnum - 1) =~ "done"}, 10000)
let line = term_getline(buf, lnum)
if line !~ 'done'
let line = term_getline(buf, lnum - 1)
@@ -815,17 +815,25 @@ func Test_terminal_response_to_control_sequence()
let buf = Run_shell_in_terminal({})
call term_wait(buf)
- call term_sendkeys(buf, s:python . " -c 'import sys;sys.stdout.write(\"\\x1b[6n\")'\<cr>")
+ new
+ call setline(1, "\x1b[6n")
+ write! Xescape
+ bwipe
+ call term_sendkeys(buf, "cat Xescape\<cr>")
+
" wait for the response of control sequence from libvterm (and send it to tty)
- call term_wait(buf, 100)
- " wait for output from tty to display
+ sleep 200m
call term_wait(buf)
- call assert_match(';\d\+R', term_getline(buf, 2))
+
+ " Wait for output from tty to display, below an empty line.
+ " It should show \e3;1R, but only 1R may show up
+ call assert_match('\<\d\+R', term_getline(buf, 3))
call term_sendkeys(buf, "\<c-c>")
call term_wait(buf)
call Stop_shell_in_terminal(buf)
exe buf . 'bwipe'
+ call delete('Xescape')
unlet g:job
endfunc
diff --git a/src/version.c b/src/version.c
index e01f2be..cd99460 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,10 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1453,
+/**/
+ 1452,
+/**/
1451,
/**/
1450,