diff options
| -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, |