commit ff1e8795772a0175017c4c4f74ce33614ea8e73a
author Bram Moolenaar <Bram@vim.org> Mon Mar 12 22:16:37 2018 +0100
committer Bram Moolenaar <Bram@vim.org> Mon Mar 12 22:16:37 2018 +0100
tree 07dc7bbd38381bb19f98f149fc1b691c31a0d0d2
parent f708ac592f47100a36f2bc12ec98ea6357fdfa27

patch 8.0.1601: highlight test fails on Win32

Problem:    Highlight test fails on Win32.
Solution:   Check for vtp and vcon support.

src/evalfunc.c

diff --git a/src/evalfunc.c b/src/evalfunc.c
index 1620efe..6076b03 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -6198,6 +6198,9 @@
 #ifdef FEAT_VREPLACE
 	"vreplace",
 #endif
+#ifdef FEAT_VTP
+	"vtp",
+#endif
 #ifdef FEAT_WILDIGN
 	"wildignore",
 #endif

src/testdir/test_highlight.vim

diff --git a/src/testdir/test_highlight.vim b/src/testdir/test_highlight.vim
index 0c4be7b..1e8efea 100644
--- a/src/testdir/test_highlight.vim
+++ b/src/testdir/test_highlight.vim
@@ -519,6 +519,11 @@
   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

src/version.c

diff --git a/src/version.c b/src/version.c
index 23b0168..50422aa 100644
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1601,
+/**/
     1600,
 /**/
     1599,