From 91805fc0db6b957c5bf688f2d96585eae9179999 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 26 Jun 2011 04:01:44 +0200 Subject: [PATCH] updated for version 7.3.232 Problem: Python doesn't compile without +multi_byte Solution: Use "latin1" when MULTI_BYTE is not defined. --- src/if_py_both.h | 10 ++++++++-- src/version.c | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/if_py_both.h b/src/if_py_both.h index 6cd1b23d3..07eedb5f3 100644 --- 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 *args) 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, PyObject *args) 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 index 1b99d275a..17e7c3168 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 */ +/**/ + 232, /**/ 231, /**/ -- 2.50.1