changeset 16613:850e13b71c1c v8.1.1309

patch 8.1.1309: test for Normal highlight fails on MS-Windows GUI commit https://github.com/vim/vim/commit/6b528fa062a5ac6bb5d8bd3abc26f32c65691d00 Author: Bram Moolenaar <Bram@vim.org> Date: Thu May 9 20:07:33 2019 +0200 patch 8.1.1309: test for Normal highlight fails on MS-Windows GUI Problem: Test for Normal highlight fails on MS-Windows GUI. Solution: Skip the test for MS-Windows GUI.
author Bram Moolenaar <Bram@vim.org>
date Thu, 09 May 2019 20:15:05 +0200
parents 1e2771cac9a8
children 306acde1a598
files src/testdir/test_highlight.vim src/version.c
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_highlight.vim
+++ b/src/testdir/test_highlight.vim
@@ -573,9 +573,12 @@ func Test_cursorline_with_visualmode()
   call delete('Xtest_cursorline_with_visualmode')
 endfunc
 
+" This test must come before the Test_cursorline test, as it appears this
+" defines the Normal highlighting group anyway.
 func Test_1_highlight_Normalgroup_exists()
-  " This test must come before the Test_cursorline test, as it appears this
-  " defines the Normal highlighting group anyway.
-  let hlNormal = HighlightArgs('Normal')
-  call assert_match('hi Normal\s*clear', hlNormal)
+  " MS-Windows GUI sets the font
+  if !has('win32') || !has('gui_running')
+    let hlNormal = HighlightArgs('Normal')
+    call assert_match('hi Normal\s*clear', hlNormal)
+  endif
 endfunc
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1309,
+/**/
     1308,
 /**/
     1307,