summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_terminal.vim3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 4a639bd87c..96edf41ca4 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -634,7 +634,8 @@ func TerminalTmap(remap)
call assert_equal('456', maparg('123', 't'))
call assert_equal('abcde', maparg('456', 't'))
call feedkeys("123", 'tx')
- call term_wait(buf)
+ let g:buf = buf
+ call WaitFor("term_getline(g:buf,term_getcursor(g:buf)[0]) =~ 'abcde\\|456'")
let lnum = term_getcursor(buf)[0]
if a:remap
call assert_match('abcde', term_getline(buf, lnum))
diff --git a/src/version.c b/src/version.c
index 8b777e7e17..ba32ecbc5d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1116,
+/**/
1115,
/**/
1114,