thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.3.236

Browse Source 
Problem:    Python 3 doesn't compile without +multi_byte
Solution:   Use "latin1" when MULTI_BYTE is not defined. (lilydjwg)
This commit is contained in:
Bram Moolenaar
2011-06-26 19:13:50 +02:00
parent 8b3e0330ba
commit 0baa7f1cd0
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/if_python3.c
View File

@@ -70,7 +70,7 @@ static void init_structs(void);
#define PyInt Py_ssize_t #define PyInt Py_ssize_t
#define PyString_Check(obj) PyUnicode_Check(obj) #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_FreeBytes(obj) Py_XDECREF(bytes)
#define PyString_AsString(obj) PyBytes_AsString(obj) #define PyString_AsString(obj) PyBytes_AsString(obj)
#define PyString_Size(obj) PyBytes_GET_SIZE(bytes) #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 /* PyRun_SimpleString expects a UTF-8 string. Wrong encoding may cause
* SyntaxError (unicode error). */ * 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); cmdbytes = PyUnicode_AsEncodedString(cmdstr, "utf-8", NULL);
Py_XDECREF(cmdstr); Py_XDECREF(cmdstr);
PyRun_SimpleString(PyBytes_AsString(cmdbytes)); PyRun_SimpleString(PyBytes_AsString(cmdbytes));
@@ -1463,7 +1463,7 @@ LineToString(const char *str)
} }
*p = '\0'; *p = '\0';
result = PyUnicode_Decode(tmp, len, (char *)p_enc, NULL); result = PyUnicode_Decode(tmp, len, (char *)ENC_OPT, NULL);
vim_free(tmp); vim_free(tmp);
return result; return result;

2
src/version.c
View File

@@ -709,6 +709,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
236,
/**/ /**/
235, 235,
/**/ /**/