From 14743042242c22a958de9ac457f8cf151de9ec84 Mon Sep 17 00:00:00 2001
From: Shougo <Shougo.Matsu@gmail.com>
Date: Sun, 15 Jan 2017 08:41:43 +0900
Subject: vim-patch:7.4.1851 (#5947)

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

https://github.com/vim/vim/commit/180fc2d41812c49b60224a1ca89945a002a090f5
---
 src/nvim/testdir/test_syn_attr.vim | 2 +-
 src/nvim/version.c                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/nvim/testdir/test_syn_attr.vim b/src/nvim/testdir/test_syn_attr.vim
index 94d6b8735f..64aab3411d 100644
--- a/src/nvim/testdir/test_syn_attr.vim
+++ b/src/nvim/testdir/test_syn_attr.vim
@@ -20,7 +20,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/nvim/version.c b/src/nvim/version.c
index 3e9cccda20..3f5e480f7f 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -589,7 +589,7 @@ static int included_patches[] = {
   // 1854 NA
   // 1853 NA
   // 1852 NA
-  // 1851,
+  1851,
   // 1850 NA
   // 1849 NA
   // 1848 NA
-- 
cgit