aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

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

Browse Source 
Problem:    The Normal highlight is not defined when compiled with GUI.
Solution:   Always define Normal. (Christian Brabandt, closes #4072)
This commit is contained in:
Bram Moolenaar
2019-05-09 19:26:38 +02:00
parent a6c27c47dd
commit f90b6e03a9
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/doc/syntax.txt
View File

@@ -5002,6 +5002,8 @@ Conceal placeholder characters substituted for concealed
text (see 'conceallevel') text (see 'conceallevel')
*hl-Cursor* *hl-Cursor*
Cursor the character under the cursor Cursor the character under the cursor
lCursor the character under the cursor when |language-mapping|
is used (see 'guicursor')
*hl-CursorIM* *hl-CursorIM*
CursorIM like Cursor, but used when in IME mode |CursorIM| CursorIM like Cursor, but used when in IME mode |CursorIM|
*hl-CursorColumn* *hl-CursorColumn*

7
src/syntax.c
View File

@@ -6865,6 +6865,7 @@ static char *(highlight_init_both[]) = {
"lCursor guibg=fg guifg=bg", /* should be different, but what? */ "lCursor guibg=fg guifg=bg", /* should be different, but what? */
#endif #endif
"default link QuickFixLine Search", "default link QuickFixLine Search",
CENT("Normal cterm=NONE", "Normal gui=NONE"),
NULL NULL
}; };
@@ -6946,9 +6947,6 @@ static char *(highlight_init_light[]) = {
#endif #endif
CENT("MatchParen term=reverse ctermbg=Cyan", CENT("MatchParen term=reverse ctermbg=Cyan",
"MatchParen term=reverse ctermbg=Cyan guibg=Cyan"), "MatchParen term=reverse ctermbg=Cyan guibg=Cyan"),
#ifdef FEAT_GUI
"Normal gui=NONE",
#endif
#ifdef FEAT_TERMINAL #ifdef FEAT_TERMINAL
CENT("StatusLineTerm term=reverse,bold cterm=bold ctermfg=White ctermbg=DarkGreen", 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"), "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", CENT("Conceal ctermbg=DarkGrey ctermfg=LightGrey",
"Conceal ctermbg=DarkGrey ctermfg=LightGrey guibg=DarkGrey guifg=LightGrey"), "Conceal ctermbg=DarkGrey ctermfg=LightGrey guibg=DarkGrey guifg=LightGrey"),
#endif #endif
#ifdef FEAT_GUI
"Normal gui=NONE",
#endif
#ifdef FEAT_TERMINAL #ifdef FEAT_TERMINAL
CENT("StatusLineTerm term=reverse,bold cterm=bold ctermfg=Black ctermbg=LightGreen", 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"), "StatusLineTerm term=reverse,bold cterm=bold ctermfg=Black ctermbg=LightGreen gui=bold guifg=bg guibg=LightGreen"),

7
src/testdir/test_highlight.vim
View File

@@ -572,3 +572,10 @@ func Test_cursorline_with_visualmode()
call StopVimInTerminal(buf) call StopVimInTerminal(buf)
call delete('Xtest_cursorline_with_visualmode') call delete('Xtest_cursorline_with_visualmode')
endfunc 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

2
src/version.c
View File

@@ -767,6 +767,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1308,
/**/ /**/
1307, 1307,
/**/ /**/