summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-06-06 12:36:15 +0200
committerBram Moolenaar <Bram@vim.org>2019-06-06 12:36:15 +0200
commit9aeb33639f49511cc16962a11a40844693ddb15e (patch)
treeac4844daf5612e855057f490ff17b93bb12a7cd5
parent4a792c87b9a643a949ee36106a2f7e971dc633f8 (diff)
patch 8.1.1474: 'ttybuiltin' is not testedv8.1.1474
Problem: 'ttybuiltin' is not tested. Solution: At least test that it doesn't break things.
-rw-r--r--src/testdir/test_termcodes.vim20
-rw-r--r--src/version.c2
2 files changed, 22 insertions, 0 deletions
diff --git a/src/testdir/test_termcodes.vim b/src/testdir/test_termcodes.vim
index d602ee5d5f..9cfc649831 100644
--- a/src/testdir/test_termcodes.vim
+++ b/src/testdir/test_termcodes.vim
@@ -717,4 +717,24 @@ func Test_get_termcode()
set t_k1=
set t_k1&
call assert_equal(k1, &t_k1)
+
+ " use external termcap first
+ set nottybuiltin
+ set t_k1=
+ set t_k1&
+ " when using external termcap may get something else, but it must not be
+ " empty, since we would fallback to the builtin one.
+ call assert_notequal('', &t_k1)
+
+ if &term =~ 'xterm'
+ " use internal termcap first
+ let term_save = &term
+ let &term = 'builtin_' .. &term
+ set t_k1=
+ set t_k1&
+ call assert_equal(k1, &t_k1)
+ let &term = term_save
+ endif
+
+ set ttybuiltin
endfunc
diff --git a/src/version.c b/src/version.c
index cd138ab9c3..a422cb0a45 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1474,
+/**/
1473,
/**/
1472,