patch 8.0.1638: popup test fails depending on environment variable
Problem: Popup test fails depending on environment variable.
Solution: Reset $COLORFGBG when running Vim in a terminal. (closes #2693)
diff --git a/src/testdir/screendump.vim b/src/testdir/screendump.vim
index c842215..c9b8085 100644
--- a/src/testdir/screendump.vim
+++ b/src/testdir/screendump.vim
@@ -30,6 +30,13 @@
" 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 0249efb..3a5bcfb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1638,
+/**/
1637,
/**/
1636,