commit f90b6e03a983b62b66564fc449e32724d6456769
author Bram Moolenaar <Bram@vim.org> Thu May 09 19:26:38 2019 +0200
committer Bram Moolenaar <Bram@vim.org> Thu May 09 19:26:38 2019 +0200
tree e29d2d7e9000428efac5d10fa705f2359f655c7e
parent a6c27c47ddf081859659d7de1caec675147e466b

patch 8.1.1308: the Normal highlight is not defined when compiled with GUI

Problem:    The Normal highlight is not defined when compiled with GUI.
Solution:   Always define Normal. (Christian Brabandt, closes #4072)

src/syntax.c

diff --git a/src/syntax.c b/src/syntax.c
index 537794a..0949145 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -6865,6 +6865,7 @@
     "lCursor guibg=fg guifg=bg", /* should be different, but what? */
 #endif
     "default link QuickFixLine Search",
+    CENT("Normal cterm=NONE", "Normal gui=NONE"),
     NULL
 };
 
@@ -6946,9 +6947,6 @@
 #endif
     CENT("MatchParen term=reverse ctermbg=Cyan",
 	 "MatchParen term=reverse ctermbg=Cyan guibg=Cyan"),
-#ifdef FEAT_GUI
-    "Normal gui=NONE",
-#endif
 #ifdef FEAT_TERMINAL
     CENT("StatusLineTerm term=reverse,bold cterm=bold ctermfg=White ctermbg=DarkGreen",
 	 "StatusLineTerm term=reverse,bold cterm=bold ctermfg=White ctermbg=DarkGreen gui=bold guifg=bg guibg=DarkGreen"),
@@ -7042,9 +7040,6 @@
     CENT("Conceal ctermbg=DarkGrey ctermfg=LightGrey",
 	 "Conceal ctermbg=DarkGrey ctermfg=LightGrey guibg=DarkGrey guifg=LightGrey"),
 #endif
-#ifdef FEAT_GUI
-    "Normal gui=NONE",
-#endif
 #ifdef FEAT_TERMINAL
     CENT("StatusLineTerm term=reverse,bold cterm=bold ctermfg=Black ctermbg=LightGreen",
 	 "StatusLineTerm term=reverse,bold cterm=bold ctermfg=Black ctermbg=LightGreen gui=bold guifg=bg guibg=LightGreen"),

src/testdir/test_highlight.vim

diff --git a/src/testdir/test_highlight.vim b/src/testdir/test_highlight.vim
index e16abf1..24379d6 100644
--- a/src/testdir/test_highlight.vim
+++ b/src/testdir/test_highlight.vim
@@ -572,3 +572,10 @@
   call StopVimInTerminal(buf)
   call delete('Xtest_cursorline_with_visualmode')
 endfunc
+
+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)
+endfunc

src/version.c

diff --git a/src/version.c b/src/version.c
index ea04ff9..63cfd8d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1308,
+/**/
     1307,
 /**/
     1306,