summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-09-07 19:30:21 +0200
committerBram Moolenaar <Bram@vim.org>2011-09-07 19:30:21 +0200
commit275648066d786aac4959cec8617aafc8264e78a2 (patch)
tree845f359f940391621cce06c84f96fc25df999a00
parent0d55ff1594b9729b75e4654e3ac74bd2e8517b79 (diff)
updated for version 7.3.300v7.3.300
Problem: Python doesn't parse multi-byte argument correctly. Solution: Use "t" instead of "s". (lilydjwg)
-rw-r--r--src/if_py_both.h4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h
index c7870bc10b..53c2167e14 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -74,7 +74,7 @@ OutputWrite(PyObject *self, PyObject *args)
char *str = NULL;
int error = ((OutputObject *)(self))->error;
- if (!PyArg_ParseTuple(args, "es#", ENC_OPT, &str, &len))
+ if (!PyArg_ParseTuple(args, "et#", ENC_OPT, &str, &len))
return NULL;
Py_BEGIN_ALLOW_THREADS
@@ -114,7 +114,7 @@ OutputWritelines(PyObject *self, PyObject *args)
char *str = NULL;
PyInt len;
- if (!PyArg_Parse(line, "es#", ENC_OPT, &str, &len)) {
+ if (!PyArg_Parse(line, "et#", ENC_OPT, &str, &len)) {
PyErr_SetString(PyExc_TypeError, _("writelines() requires list of strings"));
Py_DECREF(list);
return NULL;
diff --git a/src/version.c b/src/version.c
index 0df2520f5d..c3614035c4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 300,
+/**/
299,
/**/
298,