Mercurial > vim
changeset 16611:96e93765d0d6 v8.1.1308
patch 8.1.1308: the Normal highlight is not defined when compiled with GUI
commit https://github.com/vim/vim/commit/f90b6e03a983b62b66564fc449e32724d6456769
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu May 9 19:26:38 2019 +0200
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 https://github.com/vim/vim/issues/4072)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 09 May 2019 19:30:07 +0200 |
| parents | 1eaf34420bb3 |
| children | 1e2771cac9a8 |
| files | runtime/doc/syntax.txt src/syntax.c src/testdir/test_highlight.vim src/version.c |
| diffstat | 4 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -5002,6 +5002,8 @@ Conceal placeholder characters substitu 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*
--- 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"),
--- 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