Merge pull request #5411 from P4Cu/vim-7.4.1549

vim-patch:7.4.1549
This commit is contained in:
James McCoy
2016-10-08 20:51:32 -04:00
committed by GitHub
2 changed files with 7 additions and 3 deletions

View File

@@ -16,9 +16,13 @@ func Test_missing_attr()
call assert_equal('', synIDattr(hlID("Mine"), "undercurl", 'gui')) call assert_equal('', synIDattr(hlID("Mine"), "undercurl", 'gui'))
if has('gui') if has('gui')
hi Mine guifg=blue guibg=red font=something let fontname = getfontname()
if fontname == ''
let fontname = 'something'
endif
exe 'hi Mine guifg=blue guibg=red font=' . escape(fontname, ' \')
call assert_equal('blue', synIDattr(hlID("Mine"), "fg", 'gui')) call assert_equal('blue', synIDattr(hlID("Mine"), "fg", 'gui'))
call assert_equal('red', synIDattr(hlID("Mine"), "bg", 'gui')) call assert_equal('red', synIDattr(hlID("Mine"), "bg", 'gui'))
call assert_equal('something', synIDattr(hlID("Mine"), "font", 'gui')) call assert_equal(fontname, synIDattr(hlID("Mine"), "font", 'gui'))
endif endif
endfunc endfunc

View File

@@ -894,7 +894,7 @@ static int included_patches[] = {
1552, 1552,
1551, 1551,
1550, 1550,
// 1549, 1549,
1548, 1548,
1547, 1547,
1546, 1546,