From: Bram Moolenaar Date: Wed, 7 Sep 2011 17:30:21 +0000 (+0200) Subject: updated for version 7.3.300 X-Git-Tag: v7.3.300 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=275648066d786aac4959cec8617aafc8264e78a2;p=vim updated for version 7.3.300 Problem: Python doesn't parse multi-byte argument correctly. Solution: Use "t" instead of "s". (lilydjwg) --- diff --git a/src/if_py_both.h b/src/if_py_both.h index c7870bc10..53c2167e1 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 0df2520f5..c3614035c 100644 --- a/src/version.c +++ b/src/version.c @@ -709,6 +709,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 300, /**/ 299, /**/