From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 12 Mar 2018 21:16:37 +0000 (+0100)
Subject: patch 8.0.1601: highlight test fails on Win32
X-Git-Tag: v8.0.1601
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff1e8795772a0175017c4c4f74ce33614ea8e73a;p=vim

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 1620efe50..6076b035a 100644
--- 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 0c4be7bf3..1e8efea1a 100644
--- 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 23b016810..50422aada 100644
--- 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,
 /**/