# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1521910807 -3600
# Node ID f5655d70484ffb0b72e0ed5f08775c9b59b3f69e
# Parent  8c37f578cb2f144eb0324241400dc88d1e7070e6
patch 8.0.1638: popup test fails depending on environment variable

commit https://github.com/vim/vim/commit/e7499ddc33508d3d341e96f84a0e7b95b2d6927c
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Mar 24 17:56:13 2018 +0100

    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 https://github.com/vim/vim/issues/2693)

diff --git a/src/testdir/screendump.vim b/src/testdir/screendump.vim
--- 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
--- 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,