aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.0.0180: error E937 is used twice

Browse Source 
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)
This commit is contained in:
Bram Moolenaar 2017-01-14 14:36:08 +01:00
parent 9be7c04e6c
commit 83381f7129
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/json.c
View File

@ -936,7 +936,7 @@ item_end:
&& dict_find(top_item->jd_tv.vval.v_dict, && dict_find(top_item->jd_tv.vval.v_dict,
top_item->jd_key, -1) != NULL) top_item->jd_key, -1) != NULL)
{ {
EMSG2(_("E937: Duplicate key in JSON: \"%s\""), EMSG2(_("E938: Duplicate key in JSON: \"%s\""),
top_item->jd_key); top_item->jd_key);
clear_tv(&top_item->jd_key_tv); clear_tv(&top_item->jd_key_tv);
clear_tv(cur_item); clear_tv(cur_item);

2
src/testdir/test_json.vim
View File

@ -152,7 +152,7 @@ func Test_json_decode()
call assert_fails('call json_decode("blah")', "E474:") call assert_fails('call json_decode("blah")', "E474:")
call assert_fails('call json_decode("true blah")', "E488:") call assert_fails('call json_decode("true blah")', "E488:")
call assert_fails('call json_decode("<foobar>")', "E474:") 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("{")', "E474:")
call assert_fails('call json_decode("{foobar}")', "E474:") call assert_fails('call json_decode("{foobar}")', "E474:")

2
src/version.c
View File

@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
180,
/**/ /**/
179, 179,
/**/ /**/