From c835293d54c223627c7d4516ee273c21a3506fa1 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 12 Mar 2016 20:15:21 +0100 Subject: [PATCH] patch 7.4.1549 Problem: Test for syntax attributes fails in Win32 GUI. Solution: Use an existing font name. --- src/testdir/test_syn_attr.vim | 8 ++++++-- src/version.c | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/testdir/test_syn_attr.vim b/src/testdir/test_syn_attr.vim index 20e9b17c46..51674d0ee2 100644 --- 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 index 943bec698b..87fdebcdec 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1549, /**/ 1548, /**/