Skip to content

Commit

Permalink
patch 8.0.1600: crash when setting t_Co to zero when 'termguicolors' …
Browse files Browse the repository at this point in the history
…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 f708ac5
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/screen.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
14 changes: 14 additions & 0 deletions src/testdir/test_highlight.vim
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -766,6 +766,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1600,
/**/
1599,
/**/
Expand Down

0 comments on commit f708ac5

Please sign in to comment.