Skip to content

Commit

Permalink
patch 8.0.1638: popup test fails depending on environment variable
Browse files Browse the repository at this point in the history
Problem:    Popup test fails depending on environment variable.
Solution:   Reset $COLORFGBG when running Vim in a terminal. (closes #2693)
  • Loading branch information
brammool committed Mar 24, 2018
1 parent 897e63c commit e7499dd
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
7 changes: 7 additions & 0 deletions src/testdir/screendump.vim
Original file line number Diff line number Diff line change
Expand Up @@ -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('$'))
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -766,6 +766,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1638,
/**/
1637,
/**/
Expand Down

0 comments on commit e7499dd

Please sign in to comment.