]> granicus.if.org Git - vim/commitdiff
patch 7.4.1498 v7.4.1498
authorBram Moolenaar <Bram@vim.org>
Sat, 5 Mar 2016 22:23:02 +0000 (23:23 +0100)
committerBram Moolenaar <Bram@vim.org>
Sat, 5 Mar 2016 22:23:02 +0000 (23:23 +0100)
Problem:    Error for locked item when using json_decode(). (Shougo)
Solution:   Initialize v_lock.

src/json.c
src/version.c

index b41d45ee0f52d38b2e87455fda1f5f7e81191192..34cf188a1df99056e91aadf175845a66e6976e2c 100644 (file)
@@ -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);
index 185161538ad61702d7a39aa8fb0926b9c0a04874..1bcccd8646f2a317c2ef06a4afa9590264eac594 100644 (file)
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1498,
 /**/
     1497,
 /**/