From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 28 Feb 2016 15:29:50 +0000 (+0100)
Subject: patch 7.4.1448
X-Git-Tag: v7.4.1448
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5215e943bf5a045089693b60b8805a794d8c2f6;p=thirdparty%2Fvim.git

patch 7.4.1448
Problem:    JSON tests fail if 'encoding' is not utf-8.
Solution:   Force encoding to utf-8.
---

diff --git a/src/testdir/test_json.vim b/src/testdir/test_json.vim
index 369bdde2fa..83adcd6406 100644
--- a/src/testdir/test_json.vim
+++ b/src/testdir/test_json.vim
@@ -1,5 +1,12 @@
 " Test for JSON functions.
+
+" JSON requires using utf-8.  Conversion breaks the asserts, therefore set
+" 'encoding' to utf-8.
+if !has('multi_byte')
+  finish
+endif
 scriptencoding utf-8
+set encoding=utf-8
 
 let s:json1 = '"str\"in\\g"'
 let s:var1 = "str\"in\\g"
diff --git a/src/version.c b/src/version.c
index f3a9183b68..eaf0ab6226 100644
--- 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 */
+/**/
+    1448,
 /**/
     1447,
 /**/