From c5215e943bf5a045089693b60b8805a794d8c2f6 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 28 Feb 2016 16:29:50 +0100 Subject: [PATCH] patch 7.4.1448 Problem: JSON tests fail if 'encoding' is not utf-8. Solution: Force encoding to utf-8. --- src/testdir/test_json.vim | 7 +++++++ src/version.c | 2 ++ 2 files changed, 9 insertions(+) diff --git a/src/testdir/test_json.vim b/src/testdir/test_json.vim index 369bdde2f..83adcd640 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 f3a9183b6..eaf0ab622 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, /**/