# HG changeset patch # User Christian Brabandt # Date 1519479905 -3600 # Node ID a90063ec1cd60e710ed02655873339754429dcf1 # Parent a5a796c538460e06a1d0e1eee9afb26e3848f59f patch 8.0.1534: C syntax test fails when using gvim commit https://github.com/vim/vim/commit/b7ea7cb8e430ea096b4c452cdc9c3299819e6d6b Author: Bram Moolenaar Date: Sat Feb 24 14:38:51 2018 +0100 patch 8.0.1534: C syntax test fails when using gvim Problem: C syntax test fails when using gvim Solution: Force running in a terminal. Check that 'background' is correct even when $COLORFGBG is set. diff --git a/src/testdir/screendump.vim b/src/testdir/screendump.vim --- a/src/testdir/screendump.vim +++ b/src/testdir/screendump.vim @@ -24,7 +24,8 @@ func RunVimInTerminal(arguments, options hi Normal ctermfg=0 ctermbg=15 let cmd = GetVimCommandClean() - let cmd .= ' ' . a:arguments + " Add -v to have gvim run in the terminal (if possible) + let cmd .= ' -v ' . a:arguments let buf = term_start(cmd, {'curwin': 1, 'term_rows': 20, 'term_cols': 75}) call assert_equal([20, 75], term_getsize(buf)) diff --git a/src/testdir/test_syntax.vim b/src/testdir/test_syntax.vim --- a/src/testdir/test_syntax.vim +++ b/src/testdir/test_syntax.vim @@ -527,6 +527,8 @@ endfunc " Check highlighting for a small piece of C code with a screen dump. func Test_syntax_c() " Need to be able to run terminal Vim with 256 colors. + " On MS-Windows the console only has 16 colors and the GUI can't run in a + " terminal. if !has('terminal') || has('win32') return endif @@ -551,9 +553,15 @@ func Test_syntax_c() \ ' }', \ '}', \ ], 'Xtest.c') + + " This makes the default for 'background' use "dark", check that the + " response to t_RB corrects it to "light". + let $COLORFGBG = '15;0' + let buf = RunVimInTerminal('Xtest.c', {}) call VerifyScreenDump(buf, 'Test_syntax_c_01') call StopVimInTerminal(buf) + let $COLORFGBG = '' call delete('Xtest.c') endfun diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -779,6 +779,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1534, +/**/ 1533, /**/ 1532,