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)

diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index c3ce75c89fcac8688367b6803c2ca5a8b30256d3..1eca1c5da8bd529a97ff62926fb00906fbfab420 100644 (file)
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -5002,6 +5002,8 @@ Conceal           placeholder characters substituted for concealed
                text (see 'conceallevel')
                                                        *hl-Cursor*
 Cursor         the character under the cursor
+lCursor                the character under the cursor when |language-mapping|
+               is used (see 'guicursor')
                                                        *hl-CursorIM*
 CursorIM       like Cursor, but used when in IME mode |CursorIM|
                                                        *hl-CursorColumn*

diff --git a/src/syntax.c b/src/syntax.c
index 537794a2d84f0d57224ebeef6356581a482b9018..09491450ba9514366be1c57ee133bf5ebc9e27f1 100644 (file)
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -6865,6 +6865,7 @@ static char *(highlight_init_both[]) = {
     "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 @@ static char *(highlight_init_light[]) = {
 #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 @@ static char *(highlight_init_dark[]) = {
     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"),

diff --git a/src/testdir/test_highlight.vim b/src/testdir/test_highlight.vim
index e16abf18372844080e9f78b350b4f6bfe8c57812..24379d626e9ebb56007b803b2ac2fcf71b59d03e 100644 (file)
--- a/src/testdir/test_highlight.vim
+++ b/src/testdir/test_highlight.vim
@@ -572,3 +572,10 @@ func Test_cursorline_with_visualmode()
   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

diff --git a/src/version.c b/src/version.c
index ea04ff99c1aaa44db6c6762d2dd5be8e766013ac..63cfd8df751ff642676e1914c92636810093a6d0 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 */
+/**/
+    1308,
 /**/
     1307,
 /**/