Skip to content

Commit c5215e9

Browse files
committed
patch 7.4.1448
Problem: JSON tests fail if 'encoding' is not utf-8. Solution: Force encoding to utf-8.
1 parent d6051b5 commit c5215e9

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

src/testdir/test_json.vim

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
" Test for JSON functions.
2+
3+
" JSON requires using utf-8. Conversion breaks the asserts, therefore set
4+
" 'encoding' to utf-8.
5+
if !has('multi_byte')
6+
finish
7+
endif
28
scriptencoding utf-8
9+
set encoding=utf-8
310

411
let s:json1 = '"str\"in\\g"'
512
let s:var1 = "str\"in\\g"

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -743,6 +743,8 @@ static char *(features[]) =
743743

744744
static int included_patches[] =
745745
{ /* Add new patch number below this line */
746+
/**/
747+
1448,
746748
/**/
747749
1447,
748750
/**/

0 commit comments

Comments
 (0)