patch 7.4.1160

Problem:    No error for jsondecode('"').
Solution:   Give an error message for missing double quote.

diff --git a/src/json.c b/src/json.c
index 442eaff2c9818c969a5dd407a381fe95d69786dd..accb6cf85d17ad90740fc24c3284b60170de91d0 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -406,6 +406,7 @@ json_decode_string(js_read_T *reader, typval_T *res)
     }
     else
     {
+       EMSG(_(e_invarg));
        res->v_type = VAR_SPECIAL;
        res->vval.v_number = VVAL_NONE;
     }

diff --git a/src/version.c b/src/version.c
index e9d5c1983e32371e2015b16c0151959a5f7320aa..25ba3b97d7162d622dd800d4cb5984d92f71949e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1160,
 /**/
     1159,
 /**/