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 369bdde2fa41dd43fd27d1bf7fabe9c5bf642923..83adcd640632a5b0d77090ef4209027b870ff4f0 100644 (file)
--- 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 f3a9183b68d1af80a2612224058f06b6e47fe700..eaf0ab6226062649bbe546f9b8f6fb4d4450ff84 100644 (file)
--- 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,
 /**/