summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-06-29 16:19:50 +0200
committerBram Moolenaar <Bram@vim.org>2012-06-29 16:19:50 +0200
commitf27839c1a9e7390bb850d768e1146014b221cc43 (patch)
tree00e23ab2884093eb62f81f3f17fd36d7fc646c76
parent11b73d668f6209acbe06988a804028c5c86799d2 (diff)
updated for version 7.3.578v7.3.578
Problem: Misplaced declaration. Solution: Move declaration to start of block.
-rw-r--r--src/if_py_both.h6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h
index f627f67af8..d828358e7f 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -818,21 +818,21 @@ DictionaryAssItem(PyObject *self, PyObject *keyObject, PyObject *valObject)
if (valObject == NULL)
{
+ hashitem_T *hi;
+
if (di == NULL)
{
PyErr_SetString(PyExc_IndexError, _("no such key in dictionary"));
return -1;
}
- hashitem_T *hi = hash_find(&d->dv_hashtab, di->di_key);
+ hi = hash_find(&d->dv_hashtab, di->di_key);
hash_remove(&d->dv_hashtab, hi);
dictitem_free(di);
return 0;
}
if (ConvertFromPyObject(valObject, &tv) == -1)
- {
return -1;
- }
if (di == NULL)
{
diff --git a/src/version.c b/src/version.c
index 58bb4732c0..9ab5188f87 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 */
/**/
+ 578,
+/**/
577,
/**/
576,