To: vim_dev@googlegroups.com Subject: Patch 8.0.1535 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1535 (after 8.0.1534) Problem: C syntax test still fails when using gvim. Solution: Clear Normal cterm highlighting instead of setting it. Files: src/testdir/test_syntax.vim, src/testdir/screendump.vim, src/testdir/dumps/Test_syntax_c_01.dump *** ../vim-8.0.1534/src/testdir/test_syntax.vim 2018-02-24 14:38:46.955964056 +0100 --- src/testdir/test_syntax.vim 2018-02-24 16:06:17.299294101 +0100 *************** *** 428,433 **** --- 428,435 ---- set bg=dark hi Normal ctermbg=12 call assert_equal('dark', &bg) + + hi Normal ctermbg=NONE endfunc func Test_syntax_hangs() *** ../vim-8.0.1534/src/testdir/screendump.vim 2018-02-24 14:38:46.955964056 +0100 --- src/testdir/screendump.vim 2018-02-24 16:41:35.766624598 +0100 *************** *** 19,27 **** split vsplit ! " Always doo this with 256 colors and a light background. ! set t_Co=256 ! hi Normal ctermfg=0 ctermbg=15 let cmd = GetVimCommandClean() " Add -v to have gvim run in the terminal (if possible) --- 19,27 ---- split vsplit ! " Always do this with 256 colors and a light background. ! set t_Co=256 background=light ! hi Normal ctermfg=NONE ctermbg=NONE let cmd = GetVimCommandClean() " Add -v to have gvim run in the terminal (if possible) *** ../vim-8.0.1534/src/testdir/dumps/Test_syntax_c_01.dump 2018-02-20 15:50:49.304325584 +0100 --- src/testdir/dumps/Test_syntax_c_01.dump 2018-02-24 16:41:39.822599566 +0100 *************** *** 1,20 **** ! |/+0#0000e05#ffffff16|*| |c|o|m@1|e|n|t| |l|i|n|e| |a|t| |t|h|e| |t|o|p| |*|/| +0#0000001&@45 ! | @1|i+0#00e0003&|n|t| +0#0000001&@69 ! |m|a|i|n|(|i+0#00e0003&|n|t| +0#0000001&|a|r|g|c|,| |c+0#00e0003&|h|a|r| +0#0000001&|*@1|a|r|g|v|)|/+0#0000e05&@1| |a|n|o|t|h|e|r| |c|o|m@1|e|n|t| +0#0000001&@29 |{| @73 ! |#+0#e000e06&|i|f| |0| +0#0000001&@69 ! | +0#0000e05&@2|i|n|t| @2|n|o|t|_|u|s|e|d|;| +0#0000001&@56 ! |#+0#e000e06&|e|l|s|e| +0#0000001&@69 ! | @2|i+0#00e0003&|n|t| +0#0000001&@2|u|s|e|d|;| @60 ! |#+0#e000e06&|e|n|d|i|f| +0#0000001&@68 ! | @2|p|r|i|n|t|f|(|"+0#e000002&|J|u|s|t| |a|n| |e|x|a|m|p|l|e| |p|i|e|c|e| |o|f| |C| |c|o|d|e|\+0#e000e06&|n|"+0#e000002&|)+0#0000001&|;| @27 ! | @2|r+0#af5f00255&|e|t|u|r|n| +0#0000001&|0+0#e000002&|x|0|f@1|;+0#0000001&| @58 |}| @73 ! | @2|s+0#00e0003&|t|a|t|i|c| +0#0000001&|v+0#00e0003&|o|i|d| +0#0000001&@60 ! |m|y|F|u|n|c|t|i|o|n|(|c+0#00e0003&|o|n|s|t| +0#0000001&|d+0#00e0003&|o|u|b|l|e| +0#0000001&|c|o|u|n|t|,| |s+0#00e0003&|t|r|u|c|t| +0#0000001&|n|o|t|h|i|n|g|,| |l+0#00e0003&|o|n|g| +0#0000001&|t|h|e|r|e|)| |{| @14 ! | @1|/+0#0000e05&@1| |1+0#e000002&|2|3|:+0#0000e05&| |n|o|t|h|i|n|g| |t|o| |r|e|a|d| |h|e|r|e| +0#0000001&@44 ! | @1|f+0#af5f00255&|o|r| +0#0000001&|(|i+0#00e0003&|n|t| +0#0000001&|i| |=| |0+0#e000002&|;+0#0000001&| |i| |<| |c|o|u|n|t|;| |+@1|i|)| |{| @39 ! | @3|b+0#af5f00255&|r|e|a|k|;+0#0000001&| @64 | @1|}| @71 |}| @73 |"|X|t|e|s|t|.|c|"| |1|9|L|,| |3|6|4|C| @37|1|,|1| @10|A|l@1| --- 1,20 ---- ! |/+0#0000e05#ffffff0|*| |c|o|m@1|e|n|t| |l|i|n|e| |a|t| |t|h|e| |t|o|p| |*|/| +0#0000000&@45 ! | @1|i+0#00e0003&|n|t| +0#0000000&@69 ! |m|a|i|n|(|i+0#00e0003&|n|t| +0#0000000&|a|r|g|c|,| |c+0#00e0003&|h|a|r| +0#0000000&|*@1|a|r|g|v|)|/+0#0000e05&@1| |a|n|o|t|h|e|r| |c|o|m@1|e|n|t| +0#0000000&@29 |{| @73 ! |#+0#e000e06&|i|f| |0| +0#0000000&@69 ! | +0#0000e05&@2|i|n|t| @2|n|o|t|_|u|s|e|d|;| +0#0000000&@56 ! |#+0#e000e06&|e|l|s|e| +0#0000000&@69 ! | @2|i+0#00e0003&|n|t| +0#0000000&@2|u|s|e|d|;| @60 ! |#+0#e000e06&|e|n|d|i|f| +0#0000000&@68 ! | @2|p|r|i|n|t|f|(|"+0#e000002&|J|u|s|t| |a|n| |e|x|a|m|p|l|e| |p|i|e|c|e| |o|f| |C| |c|o|d|e|\+0#e000e06&|n|"+0#e000002&|)+0#0000000&|;| @27 ! | @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&|x|0|f@1|;+0#0000000&| @58 |}| @73 ! | @2|s+0#00e0003&|t|a|t|i|c| +0#0000000&|v+0#00e0003&|o|i|d| +0#0000000&@60 ! |m|y|F|u|n|c|t|i|o|n|(|c+0#00e0003&|o|n|s|t| +0#0000000&|d+0#00e0003&|o|u|b|l|e| +0#0000000&|c|o|u|n|t|,| |s+0#00e0003&|t|r|u|c|t| +0#0000000&|n|o|t|h|i|n|g|,| |l+0#00e0003&|o|n|g| +0#0000000&|t|h|e|r|e|)| |{| @14 ! | @1|/+0#0000e05&@1| |1+0#e000002&|2|3|:+0#0000e05&| |n|o|t|h|i|n|g| |t|o| |r|e|a|d| |h|e|r|e| +0#0000000&@44 ! | @1|f+0#af5f00255&|o|r| +0#0000000&|(|i+0#00e0003&|n|t| +0#0000000&|i| |=| |0+0#e000002&|;+0#0000000&| |i| |<| |c|o|u|n|t|;| |+@1|i|)| |{| @39 ! | @3|b+0#af5f00255&|r|e|a|k|;+0#0000000&| @64 | @1|}| @71 |}| @73 |"|X|t|e|s|t|.|c|"| |1|9|L|,| |3|6|4|C| @37|1|,|1| @10|A|l@1| *** ../vim-8.0.1534/src/version.c 2018-02-24 14:38:46.955964056 +0100 --- src/version.c 2018-02-24 16:49:56.951567806 +0100 *************** *** 780,781 **** --- 780,783 ---- { /* Add new patch number below this line */ + /**/ + 1535, /**/ -- You can be stopped by the police for biking over 65 miles per hour. You are not allowed to walk across a street on your hands. [real standing laws in Connecticut, United States of America] /// 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 ///