Mercurial > vim

comparison src/json.c @ 10581:dffda1f9b501 v8.0.0180

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0180: error E937 is used twice commit https://github.com/vim/vim/commit/83381f7129aca00bc2dd24527f160bc6a60d70af Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jan 14 14:36:08 2017 +0100 patch 8.0.0180: error E937 is used twice 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)
author Christian Brabandt <cb@256bit.org>
date Sat, 14 Jan 2017 14:45:04 +0100
parents bac9cec298ed
children bb4360d64eb2
comparison
equal deleted inserted replaced
10580:1948f216f40d 10581:dffda1f9b501
934 case JSON_OBJECT: 934 case JSON_OBJECT:
935 if (cur_item != NULL 935 if (cur_item != NULL
936 && dict_find(top_item->jd_tv.vval.v_dict, 936 && dict_find(top_item->jd_tv.vval.v_dict,
937 top_item->jd_key, -1) != NULL) 937 top_item->jd_key, -1) != NULL)
938 { 938 {
939 EMSG2(_("E937: Duplicate key in JSON: \"%s\""), 939 EMSG2(_("E938: Duplicate key in JSON: \"%s\""),
940 top_item->jd_key); 940 top_item->jd_key);
941 clear_tv(&top_item->jd_key_tv); 941 clear_tv(&top_item->jd_key_tv);
942 clear_tv(cur_item); 942 clear_tv(cur_item);
943 retval = FAIL; 943 retval = FAIL;
944 goto theend; 944 goto theend;