summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-02-15 15:59:03 +0100
committerBram Moolenaar <Bram@vim.org>2014-02-15 15:59:03 +0100
commit403b3cf0a1ee4c7c1862ef52d42713b90c75a5ee (patch)
treefaba4c49142f7ddc53cbe9c9094795b0af2b9e2c
parent0e4eebd4254017970b7389f66315ebed1486e1ed (diff)
downloadvim-git-403b3cf0a1ee4c7c1862ef52d42713b90c75a5ee.tar.gz
updated for version 7.4.180v7.4.180
Problem: Older Python versions don't support %ld. Solution: Use %d instead. (ZyX)
-rw-r--r--src/if_py_both.h8
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 4 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h
index a0902b217..2442220c0 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -2510,8 +2510,8 @@ ListAssSlice(ListObject *self, Py_ssize_t first,
{
Py_DECREF(iterator);
PyErr_FORMAT(PyExc_ValueError,
- N_("attempt to assign sequence of size greater then %ld "
- "to extended slice"), (long)slicelen);
+ N_("attempt to assign sequence of size greater then %d "
+ "to extended slice"), (int) slicelen);
list_restore(numadded, numreplaced, slicelen, l, lis, lastaddedli);
PyMem_Free(lis);
return -1;
@@ -2523,8 +2523,8 @@ ListAssSlice(ListObject *self, Py_ssize_t first,
if (step != 1 && i != slicelen)
{
PyErr_FORMAT2(PyExc_ValueError,
- N_("attempt to assign sequence of size %ld to extended slice "
- "of size %ld"), (long)i, (long)slicelen);
+ N_("attempt to assign sequence of size %d to extended slice "
+ "of size %d"), (int) i, (int) slicelen);
list_restore(numadded, numreplaced, slicelen, l, lis, lastaddedli);
PyMem_Free(lis);
return -1;
diff --git a/src/version.c b/src/version.c
index 1277b1e98..9036cf7b2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 180,
+/**/
179,
/**/
178,