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 510b743..8901b15 100644
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -176,6 +176,7 @@
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 e295649..3ceece3 100644
--- a/src/testdir/test_alot.vim
+++ b/src/testdir/test_alot.vim
@@ -6,7 +6,6 @@
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 83adcd6..4955cad 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 8853a78..d9697a8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1450,
+/**/
1449,
/**/
1448,