aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-24 10:45:12 -04:00
Code

patch 8.0.1638: popup test fails depending on environment variable

Browse Source 
Problem:    Popup test fails depending on environment variable.
Solution:   Reset $COLORFGBG when running Vim in a terminal. (closes #2693)
This commit is contained in:
Bram Moolenaar 2018-03-24 17:56:13 +01:00
parent 897e63c4c0
commit e7499ddc33
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/testdir/screendump.vim
View File

@ -30,6 +30,13 @@ func RunVimInTerminal(arguments, options)
" Remove it here. " Remove it here.
call delete(".swp") 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 " 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. " size terminal window. Works only when we currently have one window.
call assert_equal(1, winnr('$')) call assert_equal(1, winnr('$'))

2
src/version.c
View File

@ -766,6 +766,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1638,
/**/ /**/
1637, 1637,
/**/ /**/