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.

diff --git a/src/testdir/test_highlight.vim b/src/testdir/test_highlight.vim
index 24379d626e9ebb56007b803b2ac2fcf71b59d03e..7c6cc64fc540ceb7d5c6934d45975d9933c734ae 100644 (file)
--- 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

diff --git a/src/version.c b/src/version.c
index 63cfd8df751ff642676e1914c92636810093a6d0..b8acb8f04189cda6781d90378a23aafa83c1ee02 100644 (file)
--- 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 */
+/**/
+    1309,
 /**/
     1308,
 /**/