diff options
| author | Bram Moolenaar <Bram@vim.org> | 2011-06-26 19:13:50 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2011-06-26 19:13:50 +0200 |
| commit | 0baa7f1cd0aad0ff011d87340e24c678853b33ca (patch) | |
| tree | 3bf1ceaaac3faf676ca4037609866c8b48649c18 | |
| parent | 8b3e0330ba1fee9ac6293f82f546e08be3f0799c (diff) | |
| download | vim-git-0baa7f1cd0aad0ff011d87340e24c678853b33ca.tar.gz | |
updated for version 7.3.236v7.3.236
Problem: Python 3 doesn't compile without +multi_byte
Solution: Use "latin1" when MULTI_BYTE is not defined. (lilydjwg)
| -rw-r--r-- | src/if_python3.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/if_python3.c b/src/if_python3.c index 5f02a468b..b16dfc68a 100644 --- a/src/if_python3.c +++ b/src/if_python3.c @@ -70,7 +70,7 @@ static void init_structs(void); #define PyInt Py_ssize_t #define PyString_Check(obj) PyUnicode_Check(obj) -#define PyString_AsBytes(obj) PyUnicode_AsEncodedString(obj, (char *)p_enc, NULL); +#define PyString_AsBytes(obj) PyUnicode_AsEncodedString(obj, (char *)ENC_OPT, NULL); #define PyString_FreeBytes(obj) Py_XDECREF(bytes) #define PyString_AsString(obj) PyBytes_AsString(obj) #define PyString_Size(obj) PyBytes_GET_SIZE(bytes) @@ -661,7 +661,7 @@ DoPy3Command(exarg_T *eap, const char *cmd) /* PyRun_SimpleString expects a UTF-8 string. Wrong encoding may cause * SyntaxError (unicode error). */ - cmdstr = PyUnicode_Decode(cmd, strlen(cmd), (char *)p_enc, NULL); + cmdstr = PyUnicode_Decode(cmd, strlen(cmd), (char *)ENC_OPT, NULL); cmdbytes = PyUnicode_AsEncodedString(cmdstr, "utf-8", NULL); Py_XDECREF(cmdstr); PyRun_SimpleString(PyBytes_AsString(cmdbytes)); @@ -1463,7 +1463,7 @@ LineToString(const char *str) } *p = '\0'; - result = PyUnicode_Decode(tmp, len, (char *)p_enc, NULL); + result = PyUnicode_Decode(tmp, len, (char *)ENC_OPT, NULL); vim_free(tmp); return result; diff --git a/src/version.c b/src/version.c index d76c4b3df..a022ccde4 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 */ /**/ + 236, +/**/ 235, /**/ 234, |