vim-patch:8.0.0616: not always setting 'background' correctly after :hi Normal (#8606)

Problem:    When setting the cterm background with ":hi Normal" the value of
            'background' may be set wrongly.
Solution:   Check that the color is less than 16.  Don't set 'background' when
            it was set explicitly. (Lemonboy, closes vim/vim#1710)
1615b36b91

Restore reset_option_was_set(), removed in 419da839e0

ref #8595
ref #8597
This commit is contained in:
Jan Edmund Lazo
2018-06-21 05:15:11 -04:00
committed by Justin M. Keyes
parent 8794a551bd
commit 52ebe34eeb
3 changed files with 47 additions and 6 deletions

View File

@@ -435,3 +435,26 @@ func Test_conceal()
bw!
endfunc
func Test_bg_detection()
if has('gui_running')
return
endif
" auto-detection of &bg, make sure sure it isn't set anywhere before
" this test
hi Normal ctermbg=0
call assert_equal('dark', &bg)
hi Normal ctermbg=4
call assert_equal('dark', &bg)
hi Normal ctermbg=12
call assert_equal('light', &bg)
hi Normal ctermbg=15
call assert_equal('light', &bg)
" manually-set &bg takes precendence over auto-detection
set bg=light
hi Normal ctermbg=4
call assert_equal('light', &bg)
set bg=dark
hi Normal ctermbg=12
call assert_equal('dark', &bg)
endfunc