# HG changeset patch # User Christian Brabandt # Date 1520890206 -3600 # Node ID 1720b96e53b62425a3b3050793ed5c5778f6b147 # Parent 5dab288bada80cef9d20ad0d60ec97d3b1db1cc8 patch 8.0.1601: highlight test fails on Win32 commit https://github.com/vim/vim/commit/ff1e8795772a0175017c4c4f74ce33614ea8e73a Author: Bram Moolenaar Date: Mon Mar 12 22:16:37 2018 +0100 patch 8.0.1601: highlight test fails on Win32 Problem: Highlight test fails on Win32. Solution: Check for vtp and vcon support. diff --git a/src/evalfunc.c b/src/evalfunc.c --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -6198,6 +6198,9 @@ f_has(typval_T *argvars, typval_T *rettv #ifdef FEAT_VREPLACE "vreplace", #endif +#ifdef FEAT_VTP + "vtp", +#endif #ifdef FEAT_WILDIGN "wildignore", #endif diff --git a/src/testdir/test_highlight.vim b/src/testdir/test_highlight.vim --- a/src/testdir/test_highlight.vim +++ b/src/testdir/test_highlight.vim @@ -519,6 +519,11 @@ func Test_termguicolors() if !exists('+termguicolors') return endif + if has('vtp') && !has('vcon') + " Win32: 'guicolors' doesn't work without virtual console. + call assert_fails('set termguicolors', 'E954:') + return + endif " Basic test that setting 'termguicolors' works with one color. set termguicolors diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1601, +/**/ 1600, /**/ 1599,