Mercurial > vim

changeset 8518:24ac80377d86 v7.4.1549

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/c835293d54c223627c7d4516ee273c21a3506fa1 Author: Bram Moolenaar <Bram@vim.org> 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.
author Christian Brabandt <cb@256bit.org>
date Sat, 12 Mar 2016 20:30:04 +0100
parents 6dfd76e21fba
children 5652fbdda911
files src/testdir/test_syn_attr.vim src/version.c
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,