To: vim_dev@googlegroups.com Subject: Patch 8.0.1534 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1534 Problem: C syntax test fails when using gvim Solution: Force running in a terminal. Check that 'background' is correct even when $COLORFGBG is set. Files: src/testdir/test_syntax.vim, src/testdir/screendump.vim *** ../vim-8.0.1533/src/testdir/test_syntax.vim 2018-02-20 17:09:12.063168427 +0100 --- src/testdir/test_syntax.vim 2018-02-24 14:36:28.876773943 +0100 *************** *** 527,532 **** --- 527,534 ---- " 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,559 **** --- 553,567 ---- \ ' }', \ '}', \ ], '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 *** ../vim-8.0.1533/src/testdir/screendump.vim 2018-02-20 15:50:49.300325612 +0100 --- src/testdir/screendump.vim 2018-02-24 14:24:28.381079016 +0100 *************** *** 24,30 **** hi Normal ctermfg=0 ctermbg=15 let cmd = GetVimCommandClean() ! let cmd .= ' ' . a:arguments let buf = term_start(cmd, {'curwin': 1, 'term_rows': 20, 'term_cols': 75}) call assert_equal([20, 75], term_getsize(buf)) --- 24,31 ---- hi Normal ctermfg=0 ctermbg=15 let cmd = GetVimCommandClean() ! " 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)) *** ../vim-8.0.1533/src/version.c 2018-02-24 14:03:49.748678084 +0100 --- src/version.c 2018-02-24 14:36:53.652628416 +0100 *************** *** 780,781 **** --- 780,783 ---- { /* Add new patch number below this line */ + /**/ + 1534, /**/ -- SIGFUN -- signature too funny (core dumped) /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///