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 c3ce75c..1eca1c5 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -5002,6 +5002,8 @@
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 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"),
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
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,