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
index 20e9b17c462271935bbdbb74b441b2616821fb24..51674d0ee2ca790e6775d9be0b8a3c2efbe83e8b 100644 (file)
--- 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 943bec698bb3952aad70dbd2ff9b68fe56f89025..87fdebcdec1b246dcd4f2195d96f961e379f2172 100644 (file)
--- 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,
 /**/