thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.1448

Browse Source 
Problem:    JSON tests fail if 'encoding' is not utf-8.
Solution:   Force encoding to utf-8.
This commit is contained in:
Bram Moolenaar
2016-02-28 16:29:50 +01:00
parent d6051b5eb8
commit c5215e943b
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/testdir/test_json.vim
View File

@@ -1,5 +1,12 @@
" Test for JSON functions. " 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 scriptencoding utf-8
set encoding=utf-8
let s:json1 = '"str\"in\\g"' let s:json1 = '"str\"in\\g"'
let s:var1 = "str\"in\\g" let s:var1 = "str\"in\\g"

2
src/version.c
View File

@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1448,
/**/ /**/
1447, 1447,
/**/ /**/