summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-05-28 13:28:10 +0200
committerBram Moolenaar <Bram@vim.org>2016-05-28 13:28:10 +0200
commit180fc2d41812c49b60224a1ca89945a002a090f5 (patch)
tree7f28d86be9272aa502f136413491ff0c1fbca0f9
parentbf981eeb6b4ee63ae8543a7f9865ab700159a79c (diff)
patch 7.4.1851v7.4.1851
Problem: test_syn_attr failes when using the GUI. (Dominique Pelle) Solution: Escape the font name properly.
-rw-r--r--src/testdir/test_syn_attr.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_syn_attr.vim b/src/testdir/test_syn_attr.vim
index 51674d0ee2..fe6acaf6e5 100644
--- 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 80793f10bb..73e08fafab 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1851,
+/**/
1850,
/**/
1849,