Mercurial > vim

changeset 8316:058b9e4a291b v7.4.1450

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/1c39102666d2ccb998059bd7ada2d2efa31a11bc Author: Bram Moolenaar <Bram@vim.org> Date: Sun Feb 28 18:04:00 2016 +0100 patch 7.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.
author Christian Brabandt <cb@256bit.org>
date Sun, 28 Feb 2016 18:15:04 +0100
parents f99a8437cbd1
children 10a72904e595
files src/testdir/Make_all.mak src/testdir/test_alot.vim src/testdir/test_json.vim src/version.c
diffstat 4 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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 \
--- 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
--- a/src/testdir/test_json.vim
+++ b/src/testdir/test_json.vim
@@ -5,8 +5,8 @@
 if !has('multi_byte')
   finish
 endif
+set encoding=utf-8
 scriptencoding utf-8
-set encoding=utf-8
 
 let s:json1 = '"str\"in\\g"'
 let s:var1 = "str\"in\\g"
--- 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,