# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1456673405 -3600
# Node ID 1001ec135d6ebc68eb2aec8593d24788e7249bdd
# Parent  1716a1f1d39c8d6f0e7f7f4c1dd6f6a7b60f26bd
commit https://github.com/vim/vim/commit/c5215e943bf5a045089693b60b8805a794d8c2f6
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Feb 28 16:29:50 2016 +0100

    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
--- 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
--- 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 */
 /**/
+    1448,
+/**/
     1447,
 /**/
     1446,