summaryrefslogtreecommitdiffstats
authorBram Moolenaar <[email protected]>2011-06-26 17:13:50 (GMT)
committer Bram Moolenaar <[email protected]>2011-06-26 17:13:50 (GMT)
commitc4ffce9c94d95e48586d77b84b27b115aae464a8 (patch) (side-by-side diff)
treedd5229693e5ecdce93c26ea8dc091ea9b15298da
parent0a51880d441fab25be59e74d90489ffdd1807bdc (diff)
downloadvim-project-c4ffce9c94d95e48586d77b84b27b115aae464a8.zip
vim-project-c4ffce9c94d95e48586d77b84b27b115aae464a8.tar.gz
vim-project-c4ffce9c94d95e48586d77b84b27b115aae464a8.tar.bz2
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)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/if_python3.c6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/if_python3.c b/src/if_python3.c
index 5f02a46..b16dfc6 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 d76c4b3..a022ccd 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,