mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
updated for version 7.3.142
Problem: Python stdout doesn't have a flush() method, causing an import to fail. Solution: Add a dummy flush() method. (Tobias Columbus)
This commit is contained in:
@@ -33,6 +33,7 @@ Python_Release_Vim(void)
|
|||||||
|
|
||||||
static PyObject *OutputWrite(PyObject *, PyObject *);
|
static PyObject *OutputWrite(PyObject *, PyObject *);
|
||||||
static PyObject *OutputWritelines(PyObject *, PyObject *);
|
static PyObject *OutputWritelines(PyObject *, PyObject *);
|
||||||
|
static PyObject *OutputFlush(PyObject *, PyObject *);
|
||||||
|
|
||||||
/* Function to write a line, points to either msg() or emsg(). */
|
/* Function to write a line, points to either msg() or emsg(). */
|
||||||
typedef void (*writefn)(char_u *);
|
typedef void (*writefn)(char_u *);
|
||||||
@@ -47,9 +48,10 @@ typedef struct
|
|||||||
|
|
||||||
static struct PyMethodDef OutputMethods[] = {
|
static struct PyMethodDef OutputMethods[] = {
|
||||||
/* name, function, calling, documentation */
|
/* name, function, calling, documentation */
|
||||||
{"write", OutputWrite, 1, "" },
|
{"write", OutputWrite, 1, ""},
|
||||||
{"writelines", OutputWritelines, 1, "" },
|
{"writelines", OutputWritelines, 1, ""},
|
||||||
{ NULL, NULL, 0, NULL }
|
{"flush", OutputFlush, 1, ""},
|
||||||
|
{ NULL, NULL, 0, NULL}
|
||||||
};
|
};
|
||||||
|
|
||||||
#define PyErr_SetVim(str) PyErr_SetString(VimError, str)
|
#define PyErr_SetVim(str) PyErr_SetString(VimError, str)
|
||||||
@@ -123,6 +125,15 @@ OutputWritelines(PyObject *self, PyObject *args)
|
|||||||
return Py_None;
|
return Py_None;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static PyObject *
|
||||||
|
OutputFlush(PyObject *self UNUSED, PyObject *args UNUSED)
|
||||||
|
{
|
||||||
|
/* do nothing */
|
||||||
|
Py_INCREF(Py_None);
|
||||||
|
return Py_None;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/* Buffer IO, we write one whole line at a time. */
|
/* Buffer IO, we write one whole line at a time. */
|
||||||
static garray_T io_ga = {0, 0, 1, 80, NULL};
|
static garray_T io_ga = {0, 0, 1, 80, NULL};
|
||||||
static writefn old_fn = NULL;
|
static writefn old_fn = NULL;
|
||||||
|
@@ -714,6 +714,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 */
|
||||||
|
/**/
|
||||||
|
142,
|
||||||
/**/
|
/**/
|
||||||
141,
|
141,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user