diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-10-08 20:51:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-08 20:51:32 -0400 |
| commit | 44084310862656788a39b53766b1d6fe18995242 (patch) | |
| tree | 1e9de0348f7fc32389d73303c0d7a6f6c9260c33 | |
| parent | 27ced483cc9cc5f25dafde5e354159c7675c8f44 (diff) | |
| parent | 99591137467b2f9113607c4eecdf87d3ee7a94ee (diff) | |
| download | rneovim-44084310862656788a39b53766b1d6fe18995242.tar.gz rneovim-44084310862656788a39b53766b1d6fe18995242.tar.bz2 rneovim-44084310862656788a39b53766b1d6fe18995242.zip | |
Merge pull request #5411 from P4Cu/vim-7.4.1549
vim-patch:7.4.1549
| -rw-r--r-- | src/nvim/testdir/test_syn_attr.vim | 8 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/nvim/testdir/test_syn_attr.vim b/src/nvim/testdir/test_syn_attr.vim index 809442eb94..94d6b8735f 100644 --- a/src/nvim/testdir/test_syn_attr.vim +++ b/src/nvim/testdir/test_syn_attr.vim @@ -16,9 +16,13 @@ func Test_missing_attr() call assert_equal('', synIDattr(hlID("Mine"), "undercurl", '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('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 endfunc diff --git a/src/nvim/version.c b/src/nvim/version.c index bdffa21f46..f2f81b5614 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -894,7 +894,7 @@ static int included_patches[] = { 1552, 1551, 1550, - // 1549, + 1549, 1548, 1547, 1546, |