aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.0625: MS-Windows: terminal test fails in white console

Browse Source 
Problem:    MS-Windows: terminal test fails in white console.
Solution:   Accept both white and black background colors.
This commit is contained in:
Bram Moolenaar 2018-12-22 18:25:30 +01:00
parent 39b5d8b514
commit 81df63537e
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/testdir/test_terminal.vim
View File

@ -159,11 +159,17 @@ func Check_123(buf)
call assert_equal('2', l[1].chars) call assert_equal('2', l[1].chars)
call assert_equal('3', l[2].chars) call assert_equal('3', l[2].chars)
call assert_equal('#00e000', l[0].fg) call assert_equal('#00e000', l[0].fg)
if has('win32')
" On Windows 'background' always defaults to dark, even though the terminal
" may use a light background. Therefore accept both white and black.
call assert_match('#ffffff\|#000000', l[0].bg)
else
if &background == 'light' if &background == 'light'
call assert_equal('#ffffff', l[0].bg) call assert_equal('#ffffff', l[0].bg)
else else
call assert_equal('#000000', l[0].bg) call assert_equal('#000000', l[0].bg)
endif endif
endif
let l = term_getline(a:buf, -1) let l = term_getline(a:buf, -1)
call assert_equal('', l) call assert_equal('', l)

2
src/version.c
View File

@ -799,6 +799,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 */
/**/
625,
/**/ /**/
624, 624,
/**/ /**/