Permalink
Browse files

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)
  • Loading branch information...
brammool committed Mar 12, 2018
1 parent 3e4b84d commit f708ac592f47100a36f2bc12ec98ea6357fdfa27
Showing with 17 additions and 1 deletion.
  1. +1 −1 src/screen.c
  2. +14 −0 src/testdir/test_highlight.vim
  3. +2 −0 src/version.c
@@ -8127,7 +8127,7 @@ screen_start_highlight(int attr)
term_bg_color(aep->ae_u.cterm.bg_color - 1);
}
if (t_colors <= 1)
if (!IS_CTERM)
{
if (aep->ae_u.term.start != NULL)
out_str(aep->ae_u.term.start);
@@ -514,3 +514,17 @@ func Test_highlight_eol_on_diff()
bwipe!
diffoff
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
@@ -766,6 +766,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1600,
/**/
1599,
/**/

0 comments on commit f708ac5

Please sign in to comment.