# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1457217004 -3600
# Node ID 8c888844de9c856ef1c41129bd3c023f63761aba
# Parent  141157e647897caea339a5e96113e115e5319c1b
commit https://github.com/vim/vim/commit/2588b5a43f049ddf542991050260237051caad77
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Mar 5 23:23:02 2016 +0100

    patch 7.4.1498
    Problem:    Error for locked item when using json_decode(). (Shougo)
    Solution:   Initialize v_lock.

diff --git a/src/json.c b/src/json.c
--- a/src/json.c
+++ b/src/json.c
@@ -506,6 +506,7 @@ json_decode_object(js_read_T *reader, ty
 		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
--- 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,