summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-06-20 14:13:06 +0200
committerBram Moolenaar <Bram@vim.org>2012-06-20 14:13:06 +0200
commited46560bf0673ab9347e9880bc6e26ce547abff1 (patch)
treeaef4368085ed4d22746cef254c403c4a4d0db328
parent9158f9e42355bfa1d956cb75cdaef37b4ab80f35 (diff)
updated for version 7.3.560v7.3.560
Problem: Get an error for a locked argument in extend(). Solution: Initialize the lock flag for a dictionary. (Yukihiro Nakadaira)
-rw-r--r--src/eval.c1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c
index 83e2016f16..1b28200664 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -19981,6 +19981,7 @@ init_var_dict(dict, dict_var)
dictitem_T *dict_var;
{
hash_init(&dict->dv_hashtab);
+ dict->dv_lock = 0;
dict->dv_refcount = DO_NOT_FREE_CNT;
dict->dv_copyID = 0;
dict_var->di_tv.vval.v_dict = dict;
diff --git a/src/version.c b/src/version.c
index 2f09e4be22..23049a807e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 560,
+/**/
559,
/**/
558,