mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
Include old Python changes in Python 3 interface.
This commit is contained in:
parent
bed7beca58
commit
d68554d4fe
@ -1828,6 +1828,7 @@ WindowSetattro(PyObject *self, PyObject *nameobj, PyObject *val)
|
||||
{
|
||||
long lnum;
|
||||
long col;
|
||||
long len;
|
||||
|
||||
if (!PyArg_Parse(val, "(ll)", &lnum, &col))
|
||||
return -1;
|
||||
@ -1842,10 +1843,16 @@ WindowSetattro(PyObject *self, PyObject *nameobj, PyObject *val)
|
||||
if (VimErrorCheck())
|
||||
return -1;
|
||||
|
||||
/* NO CHECK ON COLUMN - SEEMS NOT TO MATTER */
|
||||
/* When column is out of range silently correct it. */
|
||||
len = (long)STRLEN(ml_get_buf(this->win->w_buffer, lnum, FALSE));
|
||||
if (col > len)
|
||||
col = len;
|
||||
|
||||
this->win->w_cursor.lnum = lnum;
|
||||
this->win->w_cursor.col = col;
|
||||
#ifdef FEAT_VIRTUALEDIT
|
||||
this->win->w_cursor.coladd = 0;
|
||||
#endif
|
||||
update_screen(VALID);
|
||||
|
||||
return 0;
|
||||
@ -2242,9 +2249,9 @@ SetBufferLine(buf_T *buf, Py_ssize_t n, PyObject *line, Py_ssize_t *len_change)
|
||||
PyErr_SetVim(_("cannot delete line"));
|
||||
else
|
||||
{
|
||||
deleted_lines_mark((linenr_T)n, 1L);
|
||||
if (buf == curwin->w_buffer)
|
||||
py_fix_cursor((linenr_T)n, (linenr_T)n + 1, (linenr_T)-1);
|
||||
deleted_lines_mark((linenr_T)n, 1L);
|
||||
}
|
||||
|
||||
curbuf = savebuf;
|
||||
|
Loading…
x
Reference in New Issue
Block a user