Skip to content

Commit f236cb6

Browse files
committed
updated for version 7.3.711
Problem: vim.current.buffer is not available. (lilydjwg) Solution: Use py3_PyUnicode_AsUTF8 instead of py3_PyUnicode_AsUTF8String. (Ken Takata)
1 parent 742e200 commit f236cb6

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

src/if_python3.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ static void init_structs(void);
176176
# define PyImport_AppendInittab py3_PyImport_AppendInittab
177177
# if PY_VERSION_HEX >= 0x030300f0
178178
# undef _PyUnicode_AsString
179-
# define _PyUnicode_AsString py3_PyUnicode_AsUTF8String
179+
# define _PyUnicode_AsString py3_PyUnicode_AsUTF8
180180
# else
181181
# define _PyUnicode_AsString py3__PyUnicode_AsString
182182
# endif
@@ -286,11 +286,11 @@ static PyObject* py3__Py_FalseStruct;
286286
static PyObject* py3__Py_TrueStruct;
287287
static int (*py3_PyModule_AddObject)(PyObject *m, const char *name, PyObject *o);
288288
static int (*py3_PyImport_AppendInittab)(const char *name, PyObject* (*initfunc)(void));
289-
#if PY_VERSION_HEX >= 0x030300f0
290-
static char* (*py3_PyUnicode_AsUTF8String)(PyObject *unicode);
291-
#else
289+
# if PY_VERSION_HEX >= 0x030300f0
290+
static char* (*py3_PyUnicode_AsUTF8)(PyObject *unicode);
291+
# else
292292
static char* (*py3__PyUnicode_AsString)(PyObject *unicode);
293-
#endif
293+
# endif
294294
static PyObject* (*py3_PyUnicode_AsEncodedString)(PyObject *unicode, const char* encoding, const char* errors);
295295
static char* (*py3_PyBytes_AsString)(PyObject *bytes);
296296
static int (*py3_PyBytes_AsStringAndSize)(PyObject *bytes, char **buffer, int *length);
@@ -348,13 +348,13 @@ static struct
348348
{"PySys_SetArgv", (PYTHON_PROC*)&py3_PySys_SetArgv},
349349
{"Py_SetPythonHome", (PYTHON_PROC*)&py3_Py_SetPythonHome},
350350
{"Py_Initialize", (PYTHON_PROC*)&py3_Py_Initialize},
351-
#ifndef PY_SSIZE_T_CLEAN
351+
# ifndef PY_SSIZE_T_CLEAN
352352
{"PyArg_ParseTuple", (PYTHON_PROC*)&py3_PyArg_ParseTuple},
353353
{"Py_BuildValue", (PYTHON_PROC*)&py3_Py_BuildValue},
354-
#else
354+
# else
355355
{"_PyArg_ParseTuple_SizeT", (PYTHON_PROC*)&py3_PyArg_ParseTuple},
356356
{"_Py_BuildValue_SizeT", (PYTHON_PROC*)&py3_Py_BuildValue},
357-
#endif
357+
# endif
358358
{"PyMem_Free", (PYTHON_PROC*)&py3_PyMem_Free},
359359
{"PyMem_Malloc", (PYTHON_PROC*)&py3_PyMem_Malloc},
360360
{"PyList_New", (PYTHON_PROC*)&py3_PyList_New},
@@ -406,11 +406,11 @@ static struct
406406
{"PyObject_Init", (PYTHON_PROC*)&py3__PyObject_Init},
407407
{"PyModule_AddObject", (PYTHON_PROC*)&py3_PyModule_AddObject},
408408
{"PyImport_AppendInittab", (PYTHON_PROC*)&py3_PyImport_AppendInittab},
409-
#if PY_VERSION_HEX >= 0x030300f0
410-
{"PyUnicode_AsUTF8String", (PYTHON_PROC*)&py3_PyUnicode_AsUTF8String},
411-
#else
409+
# if PY_VERSION_HEX >= 0x030300f0
410+
{"PyUnicode_AsUTF8", (PYTHON_PROC*)&py3_PyUnicode_AsUTF8},
411+
# else
412412
{"_PyUnicode_AsString", (PYTHON_PROC*)&py3__PyUnicode_AsString},
413-
#endif
413+
# endif
414414
{"PyBytes_AsString", (PYTHON_PROC*)&py3_PyBytes_AsString},
415415
{"PyBytes_AsStringAndSize", (PYTHON_PROC*)&py3_PyBytes_AsStringAndSize},
416416
{"PyBytes_FromString", (PYTHON_PROC*)&py3_PyBytes_FromString},
@@ -503,12 +503,12 @@ py3_runtime_link_init(char *libname, int verbose)
503503

504504
/* Load unicode functions separately as only the ucs2 or the ucs4 functions
505505
* will be present in the library. */
506-
#if PY_VERSION_HEX >= 0x030300f0
506+
# if PY_VERSION_HEX >= 0x030300f0
507507
ucs_from_string = symbol_from_dll(hinstPy3, "PyUnicode_FromString");
508508
ucs_decode = symbol_from_dll(hinstPy3, "PyUnicode_Decode");
509509
ucs_as_encoded_string = symbol_from_dll(hinstPy3,
510510
"PyUnicode_AsEncodedString");
511-
#else
511+
# else
512512
ucs_from_string = symbol_from_dll(hinstPy3, "PyUnicodeUCS2_FromString");
513513
ucs_decode = symbol_from_dll(hinstPy3,
514514
"PyUnicodeUCS2_Decode");
@@ -523,7 +523,7 @@ py3_runtime_link_init(char *libname, int verbose)
523523
ucs_as_encoded_string = symbol_from_dll(hinstPy3,
524524
"PyUnicodeUCS4_AsEncodedString");
525525
}
526-
#endif
526+
# endif
527527
if (ucs_from_string && ucs_decode && ucs_as_encoded_string)
528528
{
529529
py3_PyUnicode_FromString = ucs_from_string;

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -725,6 +725,8 @@ static char *(features[]) =
725725

726726
static int included_patches[] =
727727
{ /* Add new patch number below this line */
728+
/**/
729+
711,
728730
/**/
729731
710,
730732
/**/

0 commit comments

Comments
 (0)