summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/json.c1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/json.c b/src/json.c
index b41d45ee0..34cf188a1 100644
--- a/src/json.c
+++ b/src/json.c
@@ -506,6 +506,7 @@ json_decode_object(js_read_T *reader, typval_T *res, int options)
return FAIL;
}
di->di_tv = item;
+ di->di_tv.v_lock = 0;
if (dict_add(res->vval.v_dict, di) == FAIL)
{
dictitem_free(di);
diff --git a/src/version.c b/src/version.c
index 185161538..1bcccd864 100644
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1498,
+/**/
1497,
/**/
1496,