From fc2457e21d136cb366076edd448e67c9732dc40a Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 28 Feb 2016 20:04:09 +0100 Subject: [PATCH] patch 7.4.1455 Problem: JSON decoding test for surrogate pairs is in the wrong place. Solution: Move the test lines. (Ken Takata) --- src/testdir/test_json.vim | 10 ++++++---- src/version.c | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/testdir/test_json.vim b/src/testdir/test_json.vim index 4955cadda3..589fcb9edc 100644 --- a/src/testdir/test_json.vim +++ b/src/testdir/test_json.vim @@ -82,8 +82,7 @@ func Test_json_encode() if has('multi_byte') call assert_equal(s:jsonmb, json_encode(s:varmb)) - call assert_equal(s:varsp1, json_decode(s:jsonsp1)) - call assert_equal(s:varsp2, json_decode(s:jsonsp2)) + " no test for surrogate pair, json_encode() doesn't create them. endif call assert_equal(s:jsonnr, json_encode(s:varnr)) @@ -120,8 +119,8 @@ func Test_json_decode() if has('multi_byte') call assert_equal(s:varmb, json_decode(s:jsonmb)) - call assert_equal(s:varsp1, js_decode(s:jsonsp1)) - call assert_equal(s:varsp2, js_decode(s:jsonsp2)) + call assert_equal(s:varsp1, json_decode(s:jsonsp1)) + call assert_equal(s:varsp2, json_decode(s:jsonsp2)) endif call assert_equal(s:varnr, json_decode(s:jsonnr)) @@ -185,6 +184,7 @@ func Test_js_encode() if has('multi_byte') call assert_equal(s:jsonmb, js_encode(s:varmb)) + " no test for surrogate pair, js_encode() doesn't create them. endif call assert_equal(s:jsonnr, js_encode(s:varnr)) @@ -223,6 +223,8 @@ func Test_js_decode() if has('multi_byte') call assert_equal(s:varmb, js_decode(s:jsonmb)) + call assert_equal(s:varsp1, js_decode(s:jsonsp1)) + call assert_equal(s:varsp2, js_decode(s:jsonsp2)) endif call assert_equal(s:varnr, js_decode(s:jsonnr)) diff --git a/src/version.c b/src/version.c index 2c21470811..17d42ce564 100644 --- 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 */ +/**/ + 1455, /**/ 1454, /**/ -- 2.47.2