Mercurial > vim

changeset 8414:8c888844de9c v7.4.1498

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Christian Brabandt <cb@256bit.org>
date Sat, 05 Mar 2016 23:30:04 +0100
parents 141157e64789
children e4cd8ab5610d
files src/json.c src/version.c
diffstat 2 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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);
--- 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,