Mercurial > vim

changeset 13454:1720b96e53b6 v8.0.1601

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1601: highlight test fails on Win32 commit https://github.com/vim/vim/commit/ff1e8795772a0175017c4c4f74ce33614ea8e73a Author: Bram Moolenaar <Bram@vim.org> 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.
author Christian Brabandt <cb@256bit.org>
date Mon, 12 Mar 2018 22:30:06 +0100
parents 5dab288bada8
children 2c2be346753f
files src/evalfunc.c src/testdir/test_highlight.vim src/version.c
diffstat 3 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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
--- 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,