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 c84221580cbcb8b545fb3264cd23405b327dd95c..c9b8085dead984f5e8367ebdfbd68914c118f647 100644 (file)
--- 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 0249efbe0f862ad8d0f8e7147ffc85e8cb0dc053..3a5bcfb75ae11306155e17d2bd4234ff9306c9bd 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -766,6 +766,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1638,
 /**/
     1637,
 /**/