# HG changeset patch # User Bram Moolenaar # Date 1545499805 -3600 # Node ID 42ce33efb23d73f76cdd257be9167267d120463c # Parent b879123385e01d56fdfdfd4d6d7b94beee042ab0 patch 8.1.0625: MS-Windows: terminal test fails in white console commit https://github.com/vim/vim/commit/81df63537e281da38b45bc1806e2b4582e804242 Author: Bram Moolenaar Date: Sat Dec 22 18:25:30 2018 +0100 patch 8.1.0625: MS-Windows: terminal test fails in white console Problem: MS-Windows: terminal test fails in white console. Solution: Accept both white and black background colors. diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -159,10 +159,16 @@ func Check_123(buf) call assert_equal('2', l[1].chars) call assert_equal('3', l[2].chars) call assert_equal('#00e000', l[0].fg) - if &background == 'light' - call assert_equal('#ffffff', l[0].bg) + 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 - call assert_equal('#000000', l[0].bg) + if &background == 'light' + call assert_equal('#ffffff', l[0].bg) + else + call assert_equal('#000000', l[0].bg) + endif endif let l = term_getline(a:buf, -1) diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -800,6 +800,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 625, +/**/ 624, /**/ 623,