patch 7.4.1851

Problem:    test_syn_attr failes when using the GUI. (Dominique Pelle)
Solution:   Escape the font name properly.

diff --git a/src/testdir/test_syn_attr.vim b/src/testdir/test_syn_attr.vim
index 51674d0ee2ca790e6775d9be0b8a3c2efbe83e8b..fe6acaf6e5e7b5bfee3524a724df661f197a72f4 100644 (file)
--- a/src/testdir/test_syn_attr.vim
+++ b/src/testdir/test_syn_attr.vim
@@ -27,7 +27,7 @@ func Test_missing_attr()
     if fontname == ''
       let fontname = 'something'
     endif
-    exe 'hi Mine guifg=blue guibg=red font=' . escape(fontname, ' \')
+    exe "hi Mine guifg=blue guibg=red font='" . fontname . "'"
     call assert_equal('blue', synIDattr(hlID("Mine"), "fg", 'gui'))
     call assert_equal('red', synIDattr(hlID("Mine"), "bg", 'gui'))
     call assert_equal(fontname, synIDattr(hlID("Mine"), "font", 'gui'))

diff --git a/src/version.c b/src/version.c
index 80793f10bb0fbcb17a59f7c095677526c4f4e874..73e08fafab05283a58302d4045d6a9d75f67e6d2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1851,
 /**/
     1850,
 /**/