From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 20 Jun 2012 12:13:06 +0000 (+0200)
Subject: updated for version 7.3.560
X-Git-Tag: v7.3.560
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed46560bf0673ab9347e9880bc6e26ce547abff1;p=thirdparty%2Fvim.git

updated for version 7.3.560
Problem:    Get an error for a locked argument in extend().
Solution:   Initialize the lock flag for a dictionary. (Yukihiro Nakadaira)
---

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
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    560,
 /**/
     559,
 /**/