vim-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 vim/vim#4072)
f90b6e03a9
This commit is contained in:
Jan Edmund Lazo 2020-01-05 22:51:49 -05:00
parent 1aacab49ea
commit 3c764aabb5
No known key found for this signature in database
GPG Key ID: 64915E6E9F735B15
4 changed files with 11 additions and 3 deletions

View File

@ -4920,6 +4920,8 @@ Conceal placeholder characters substituted for concealed
text (see 'conceallevel')
*hl-Cursor*
Cursor 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*

View File

@ -5959,6 +5959,7 @@ static const char *highlight_init_both[] = {
"IncSearch cterm=reverse gui=reverse",
"ModeMsg cterm=bold gui=bold",
"NonText ctermfg=Blue gui=bold guifg=Blue",
"Normal cterm=NONE gui=NONE",
"PmenuSbar ctermbg=Grey guibg=Grey",
"StatusLine cterm=reverse,bold gui=reverse,bold",
"StatusLineNC cterm=reverse gui=reverse",
@ -6010,7 +6011,6 @@ static const char *highlight_init_light[] = {
"Title ctermfg=DarkMagenta gui=bold guifg=Magenta",
"Visual guibg=LightGrey",
"WarningMsg ctermfg=DarkRed guifg=Red",
"Normal gui=NONE",
NULL
};
@ -6044,7 +6044,6 @@ static const char *highlight_init_dark[] = {
"Title ctermfg=LightMagenta gui=bold guifg=Magenta",
"Visual guibg=DarkGrey",
"WarningMsg ctermfg=LightRed guifg=Red",
"Normal gui=NONE",
NULL
};

View File

@ -591,3 +591,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

View File

@ -987,7 +987,7 @@ describe('Screen default colors', function()
it('can be set to light', function()
startup(true, false)
screen:expect{condition=function()
eq({rgb_bg=Screen.colors.White, rgb_fg=0, rgb_sp=Screen.colors.Red,
eq({rgb_fg=Screen.colors.White, rgb_bg=0, rgb_sp=Screen.colors.Red,
cterm_bg=0, cterm_fg=0}, screen.default_colors)
end}
end)