# HG changeset patch # User Bram Moolenaar # Date 1309053704 -7200 # Node ID b67d3a44262a97e7b3ae212fcffb36926b5f53f4 # Parent 01e64f5ca043991dee7697a572e984b0926dda3f updated for version 7.3.232 Problem: Python doesn't compile without +multi_byte Solution: Use "latin1" when MULTI_BYTE is not defined. diff --git a/src/if_py_both.h b/src/if_py_both.h --- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -12,6 +12,12 @@ * Common code for if_python.c and if_python3.c. */ +#ifdef FEAT_MBYTE +# define ENC_OPT p_enc +#else +# define ENC_OPT "latin1" +#endif + /* * obtain a lock on the Vim data structures */ @@ -68,7 +74,7 @@ OutputWrite(PyObject *self, PyObject *ar char *str = NULL; int error = ((OutputObject *)(self))->error; - if (!PyArg_ParseTuple(args, "es#", p_enc, &str, &len)) + if (!PyArg_ParseTuple(args, "es#", ENC_OPT, &str, &len)) return NULL; Py_BEGIN_ALLOW_THREADS @@ -108,7 +114,7 @@ OutputWritelines(PyObject *self, PyObjec char *str = NULL; PyInt len; - if (!PyArg_Parse(line, "es#", p_enc, &str, &len)) { + if (!PyArg_Parse(line, "es#", 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 --- 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 */ /**/ + 232, +/**/ 231, /**/ 230,