0
0
mirror of https://github.com/vim/vim.git synced 2025-07-04 23:07:33 -04:00

patch 8.0.1600: crash when setting t_Co to zero when 'termguicolors' is set

Problem:    Crash when setting t_Co to zero when 'termguicolors' is set.
Solution:   Use IS_CTERM instead of checking the number of colors.
            (closes #2710)
This commit is contained in:
Bram Moolenaar 2018-03-12 21:48:32 +01:00
parent 3e4b84d0b5
commit f708ac592f
3 changed files with 17 additions and 1 deletions

View File

@ -8127,7 +8127,7 @@ screen_start_highlight(int attr)
term_bg_color(aep->ae_u.cterm.bg_color - 1); term_bg_color(aep->ae_u.cterm.bg_color - 1);
} }
if (t_colors <= 1) if (!IS_CTERM)
{ {
if (aep->ae_u.term.start != NULL) if (aep->ae_u.term.start != NULL)
out_str(aep->ae_u.term.start); out_str(aep->ae_u.term.start);

View File

@ -514,3 +514,17 @@ func Test_highlight_eol_on_diff()
bwipe! bwipe!
diffoff diffoff
endfunc endfunc
func Test_termguicolors()
if !exists('+termguicolors')
return
endif
" Basic test that setting 'termguicolors' works with one color.
set termguicolors
redraw
set t_Co=1
redraw
set t_Co=0
redraw
endfunc

View File

@ -766,6 +766,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 */
/**/
1600,
/**/ /**/
1599, 1599,
/**/ /**/