Skip to content

Commit c835293

Browse files
committed
patch 7.4.1549
Problem: Test for syntax attributes fails in Win32 GUI. Solution: Use an existing font name.
1 parent 5a2800f commit c835293

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

src/testdir/test_syn_attr.vim

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,13 @@ func Test_missing_attr()
2323
call assert_equal('', synIDattr(hlID("Mine"), "undercurl", 'gui'))
2424

2525
if has('gui')
26-
hi Mine guifg=blue guibg=red font=something
26+
let fontname = getfontname()
27+
if fontname == ''
28+
let fontname = 'something'
29+
endif
30+
exe 'hi Mine guifg=blue guibg=red font=' . escape(fontname, ' \')
2731
call assert_equal('blue', synIDattr(hlID("Mine"), "fg", 'gui'))
2832
call assert_equal('red', synIDattr(hlID("Mine"), "bg", 'gui'))
29-
call assert_equal('something', synIDattr(hlID("Mine"), "font", 'gui'))
33+
call assert_equal(fontname, synIDattr(hlID("Mine"), "font", 'gui'))
3034
endif
3135
endfunc

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -743,6 +743,8 @@ static char *(features[]) =
743743

744744
static int included_patches[] =
745745
{ /* Add new patch number below this line */
746+
/**/
747+
1549,
746748
/**/
747749
1548,
748750
/**/

0 commit comments

Comments
 (0)