diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-02-28 18:04:00 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-02-28 18:04:00 +0100 |
commit | 1c39102666d2ccb998059bd7ada2d2efa31a11bc (patch) | |
tree | af7db459a6530d1ac526dadd90807ff6ba3af9d8 | |
parent | 8cc6977a9655603bfc4aab64edddafef147da65e (diff) | |
download | vim-git-1c39102666d2ccb998059bd7ada2d2efa31a11bc.tar.gz |
patch 7.4.1450v7.4.1450
Problem: Json encoding still fails when encoding is not utf-8.
Solution: Set 'encoding' before :scriptencoding. Run the json test
separately to avoid affecting other tests.
-rw-r--r-- | src/testdir/Make_all.mak | 1 | ||||
-rw-r--r-- | src/testdir/test_alot.vim | 1 | ||||
-rw-r--r-- | src/testdir/test_json.vim | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak index 510b743e2..8901b1589 100644 --- a/src/testdir/Make_all.mak +++ b/src/testdir/Make_all.mak @@ -176,6 +176,7 @@ NEW_TESTS = test_arglist.res \ test_channel.res \ test_hardcopy.res \ test_increment.res \ + test_json.res \ test_langmap.res \ test_perl.res \ test_quickfix.res \ diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim index e2956492f..3ceece32d 100644 --- a/src/testdir/test_alot.vim +++ b/src/testdir/test_alot.vim @@ -6,7 +6,6 @@ source test_cursor_func.vim source test_delete.vim source test_expand.vim source test_glob2regpat.vim -source test_json.vim source test_lispwords.vim source test_menu.vim source test_reltime.vim diff --git a/src/testdir/test_json.vim b/src/testdir/test_json.vim index 83adcd640..4955cadda 100644 --- a/src/testdir/test_json.vim +++ b/src/testdir/test_json.vim @@ -5,8 +5,8 @@ if !has('multi_byte') finish endif -scriptencoding utf-8 set encoding=utf-8 +scriptencoding 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 8853a7848..d9697a8f9 100644 --- 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 */ /**/ + 1450, +/**/ 1449, /**/ 1448, |