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.

diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index 510b743e20e14dcb969f39d96b39d97e3946285b..8901b158961230332c8cb99022faed1359ceb8ce 100644 (file)
--- 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 e2956492f347aafa2094de371b8c7c1da0c5a08b..3ceece32d9eff5df0ef72867f1f022ca5850aca1 100644 (file)
--- 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 83adcd640632a5b0d77090ef4209027b870ff4f0..4955cadda3129deec1aa91e4369b9a0d4dd13089 100644 (file)
--- 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 8853a7848877326ea06f0dc3df94dc861300bd9f..d9697a8f9635bcf8a286458b4a185fb06dfd5587 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 */
+/**/
+    1450,
 /**/
     1449,
 /**/