summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-10-06 12:02:15 +0200
committerBram Moolenaar <Bram@vim.org>2019-10-06 12:02:15 +0200
commiteb66328bd78c3001d71138306325718cb1c94712 (patch)
tree2aac513e400a02a3c353e3db8c97c3dd2b613b02
parent49474ca12236776bb56aeb9d39bd6592e28157c7 (diff)
patch 8.1.2118: termcodes test fails when $TERM is "dumb"v8.1.2118
Problem: Termcodes test fails when $TERM is "dumb". Solution: Skip the test. (James McCoy, closes #5019)
-rw-r--r--src/testdir/test_termcodes.vim6
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/testdir/test_termcodes.vim b/src/testdir/test_termcodes.vim
index 96bbdbb44f..6174723173 100644
--- a/src/testdir/test_termcodes.vim
+++ b/src/testdir/test_termcodes.vim
@@ -798,7 +798,11 @@ func Test_xx_term_style_response()
endfunc
func Test_get_termcode()
- let k1 = &t_k1
+ try
+ let k1 = &t_k1
+ catch /E113/
+ throw 'Skipped: Unable to query termcodes'
+ endtry
set t_k1=
set t_k1&
call assert_equal(k1, &t_k1)
diff --git a/src/version.c b/src/version.c
index fa4930b7cc..0fa8440e35 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2118,
+/**/
2117,
/**/
2116,