# HG changeset patch # User Christian Brabandt # Date 1457811004 -3600 # Node ID 24ac80377d86c123b6d22502a6fb70fec985998e # Parent 6dfd76e21fba99ab865ec2fd388a0a2f239a4f9f commit https://github.com/vim/vim/commit/c835293d54c223627c7d4516ee273c21a3506fa1 Author: Bram Moolenaar Date: Sat Mar 12 20:15:21 2016 +0100 patch 7.4.1549 Problem: Test for syntax attributes fails in Win32 GUI. Solution: Use an existing font name. diff --git a/src/testdir/test_syn_attr.vim b/src/testdir/test_syn_attr.vim --- a/src/testdir/test_syn_attr.vim +++ b/src/testdir/test_syn_attr.vim @@ -23,9 +23,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/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -744,6 +744,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1549, +/**/ 1548, /**/ 1547,