diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-03-24 17:56:13 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-03-24 17:56:13 +0100 |
| commit | e7499ddc33508d3d341e96f84a0e7b95b2d6927c (patch) | |
| tree | f1c4189908b7a798f96dfb3a97f5b84fbd7df0ca | |
| parent | 897e63c4c0623078b5b39e2715b10f456a2453e7 (diff) | |
patch 8.0.1638: popup test fails depending on environment variablev8.0.1638
Problem: Popup test fails depending on environment variable.
Solution: Reset $COLORFGBG when running Vim in a terminal. (closes #2693)
| -rw-r--r-- | src/testdir/screendump.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/testdir/screendump.vim b/src/testdir/screendump.vim index c84221580c..c9b8085dea 100644 --- a/src/testdir/screendump.vim +++ b/src/testdir/screendump.vim @@ -30,6 +30,13 @@ func RunVimInTerminal(arguments, options) " Remove it here. call delete(".swp") + if exists('$COLORFGBG') + " Clear $COLORFGBG to avoid 'background' being set to "dark", which will + " only be corrected if the response to t_RB is received, which may be too + " late. + let $COLORFGBG = '' + endif + " Make a horizontal and vertical split, so that we can get exactly the right " size terminal window. Works only when we currently have one window. call assert_equal(1, winnr('$')) diff --git a/src/version.c b/src/version.c index 0249efbe0f..3a5bcfb75a 100644 --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1638, +/**/ 1637, /**/ 1636, |