aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 8.1.1162: incorrect coverage information; typo in color name

Browse Source 
Problem:    Incorrect coverage information; typo in color name.
Solution:   Fix the typo.  Set environment variables to have a nested Vim
            write the coverage info in another directory.
This commit is contained in:
Bram Moolenaar
2019-04-13 13:13:54 +02:00
parent 1d79ce81e7
commit f587ef345e
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/testdir/dumps/Test_terminal_all_ansi_colors.dump
View File

@@ -1,4 +1,4 @@
>A+0#0000001#e0e0e08@1|B+0#e000002#ff404010@1|C+0#00e0003#40ff4011@1|D+0#af5f00255#ffffff0@1|E+0#0000e05#4040ff13@1|F+0#e000e06#ff40ff14@1|G+0#00e0e07#40ffff15@1|H+0#e0e0e08#0000001@1|I+0#6c6c6c255#ffffff16@1|J+0#ff404010#e000002@1|K+0#40ff4011#00e0003@1|L+0#ffff4012#af5f00255@1|M+0#4040ff13#0000e05@1|N+0#ff40ff14#e000e06@1|O+0#40ffff15#00e0e07@1|P+0#ffffff16#6c6c6c255@1| +0#0000000#ffffff0@42 >A+0#0000001#e0e0e08@1|B+0#e000002#ff404010@1|C+0#00e0003#40ff4011@1|D+0#af5f00255#ffff4012@1|E+0#0000e05#4040ff13@1|F+0#e000e06#ff40ff14@1|G+0#00e0e07#40ffff15@1|H+0#e0e0e08#0000001@1|I+0#6c6c6c255#ffffff16@1|J+0#ff404010#e000002@1|K+0#40ff4011#00e0003@1|L+0#ffff4012#af5f00255@1|M+0#4040ff13#0000e05@1|N+0#ff40ff14#e000e06@1|O+0#40ffff15#00e0e07@1|P+0#ffffff16#6c6c6c255@1| +0#0000000#ffffff0@42
@2| +0#4040ff13&@72 @2| +0#4040ff13&@72
|~| @73 |~| @73
|~| @73 |~| @73

10
src/testdir/screendump.vim
View File

@@ -55,8 +55,16 @@ func RunVimInTerminal(arguments, options)
let cmd = GetVimCommandClean() let cmd = GetVimCommandClean()
" Add -v to have gvim run in the terminal (if possible) " Add -v to have gvim run in the terminal (if possible)
" The GCOV_ environment variables cause the Vim running in the terminal to
" write the coverage information in the "nested" directory, to avoid two Vim
" instances try to write to the same coverage info file.
let cmd .= ' -v ' . a:arguments let cmd .= ' -v ' . a:arguments
let buf = term_start(cmd, {'curwin': 1, 'term_rows': rows, 'term_cols': cols}) let buf = term_start(cmd, {
\ 'curwin': 1,
\ 'term_rows': rows,
\ 'term_cols': cols,
\ 'env': {'GCOV_PREFIX': 'nested', 'GCOV_PREFIX_STRIP': 99},
\ })
if &termwinsize == '' if &termwinsize == ''
" in the GUI we may end up with a different size, try to set it. " in the GUI we may end up with a different size, try to set it.
if term_getsize(buf) != [rows, cols] if term_getsize(buf) != [rows, cols]

2
src/testdir/test_terminal.vim
View File

@@ -1495,7 +1495,7 @@ func Test_terminal_all_ansi_colors()
\ 'hi Tblack ctermfg=Black ctermbg=Lightgrey', \ 'hi Tblack ctermfg=Black ctermbg=Lightgrey',
\ 'hi Tdarkred ctermfg=Darkred ctermbg=Red', \ 'hi Tdarkred ctermfg=Darkred ctermbg=Red',
\ 'hi Tdarkgreen ctermfg=Darkgreen ctermbg=Green', \ 'hi Tdarkgreen ctermfg=Darkgreen ctermbg=Green',
\ 'hi Tbrown ctermfg=Brown ctermbg=Yello', \ 'hi Tbrown ctermfg=Brown ctermbg=Yellow',
\ 'hi Tdarkblue ctermfg=Darkblue ctermbg=Blue', \ 'hi Tdarkblue ctermfg=Darkblue ctermbg=Blue',
\ 'hi Tdarkmagenta ctermfg=Darkmagenta ctermbg=Magenta', \ 'hi Tdarkmagenta ctermfg=Darkmagenta ctermbg=Magenta',
\ 'hi Tdarkcyan ctermfg=Darkcyan ctermbg=Cyan', \ 'hi Tdarkcyan ctermfg=Darkcyan ctermbg=Cyan',

2
src/version.c
View File

@@ -771,6 +771,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1162,
/**/ /**/
1161, 1161,
/**/ /**/