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
index 1620efe50179f6547a7910eee05fa9d33efd3965..6076b035aba2aeade077b8bfe90310570b015822 100644 (file)
--- 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
index 0c4be7bf39043455e5eee71243a264ecf47321ed..1e8efea1addedd6057482800c46ae43e44921061 100644 (file)
--- 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
index 23b0168101e3721bcaf1a3b9e6c2d3af5803d12a..50422aada7f45158e11ced88624317e7b9058a56 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -766,6 +766,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1601,
 /**/
     1600,
 /**/