diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-01-14 14:36:08 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-01-14 14:36:08 +0100 |
| commit | 83381f7129aca00bc2dd24527f160bc6a60d70af (patch) | |
| tree | 23fdd9e2ae5d8d6a964d44d827248bc150c374a4 | |
| parent | 9be7c04e6cd5b0facedcb56b09a5bcfc339efe03 (diff) | |
| download | vim-git-83381f7129aca00bc2dd24527f160bc6a60d70af.tar.gz | |
patch 8.0.0180: error E937 is used twicev8.0.0180
Problem: Error E937 is used both for duplicate key in JSON and for trying
to delete a buffer that is in use.
Solution: Rename the JSON error to E938. (Norio Takagi, closes #1376)
| -rw-r--r-- | src/json.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_json.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/json.c b/src/json.c index faaeab35c..a9333cf07 100644 --- a/src/json.c +++ b/src/json.c @@ -936,7 +936,7 @@ item_end: && dict_find(top_item->jd_tv.vval.v_dict, top_item->jd_key, -1) != NULL) { - EMSG2(_("E937: Duplicate key in JSON: \"%s\""), + EMSG2(_("E938: Duplicate key in JSON: \"%s\""), top_item->jd_key); clear_tv(&top_item->jd_key_tv); clear_tv(cur_item); diff --git a/src/testdir/test_json.vim b/src/testdir/test_json.vim index bd348fc42..661636513 100644 --- a/src/testdir/test_json.vim +++ b/src/testdir/test_json.vim @@ -152,7 +152,7 @@ func Test_json_decode() call assert_fails('call json_decode("blah")', "E474:") call assert_fails('call json_decode("true blah")', "E488:") call assert_fails('call json_decode("<foobar>")', "E474:") - call assert_fails('call json_decode("{\"a\":1,\"a\":2}")', "E937:") + call assert_fails('call json_decode("{\"a\":1,\"a\":2}")', "E938:") call assert_fails('call json_decode("{")', "E474:") call assert_fails('call json_decode("{foobar}")', "E474:") diff --git a/src/version.c b/src/version.c index dd5f700f8..7b576afcc 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 180, +/**/ 179, /**/ 178, |