diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-05-09 20:07:33 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-05-09 20:07:33 +0200 |
| commit | 6b528fa062a5ac6bb5d8bd3abc26f32c65691d00 (patch) | |
| tree | a8b1d55922d019f9575bed3f48574cc906065326 | |
| parent | f90b6e03a983b62b66564fc449e32724d6456769 (diff) | |
patch 8.1.1309: test for Normal highlight fails on MS-Windows GUIv8.1.1309
Problem: Test for Normal highlight fails on MS-Windows GUI.
Solution: Skip the test for MS-Windows GUI.
| -rw-r--r-- | src/testdir/test_highlight.vim | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/testdir/test_highlight.vim b/src/testdir/test_highlight.vim index 24379d626e..7c6cc64fc5 100644 --- 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 63cfd8df75..b8acb8f041 100644 --- 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, |