diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-23 22:51:07 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-23 22:51:07 +0100 |
| commit | bd4593ffb170230504500ddedabad3fad1f31291 (patch) | |
| tree | e55829c61c2cb79d967010b07dc83c1adae08c74 /src | |
| parent | e240c2da796531e807ea9df78bdbcc7b1012870c (diff) | |
| download | vim-git-bd4593ffb170230504500ddedabad3fad1f31291.tar.gz | |
patch 7.4.1160v7.4.1160
Problem: No error for jsondecode('"').
Solution: Give an error message for missing double quote.
Diffstat (limited to 'src')
| -rw-r--r-- | src/json.c | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/json.c b/src/json.c index 442eaff2c..accb6cf85 100644 --- 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 e9d5c1983..25ba3b97d 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1160, +/**/ 1159, /**/ 1158, |