From badfde1bfe756d529389bee7084341e4adbdf495 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 3 Nov 2009 10:43:27 +0000 Subject: updated for version 7.2-268 --- src/if_python.c | 9 ++++++++- src/version.c | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/if_python.c b/src/if_python.c index e483bfc8a..b9a12fa21 100644 --- a/src/if_python.c +++ b/src/if_python.c @@ -2058,6 +2058,7 @@ WindowSetattr(PyObject *self, char *name, PyObject *val) { long lnum; long col; + long len; if (!PyArg_Parse(val, "(ll)", &lnum, &col)) return -1; @@ -2072,10 +2073,16 @@ WindowSetattr(PyObject *self, char *name, PyObject *val) if (VimErrorCheck()) return -1; - /* NO CHECK ON COLUMN - SEEMS NOT TO MATTER */ + /* When column is out of range silently correct it. */ + len = 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; diff --git a/src/version.c b/src/version.c index a1e052c4d..923057108 100644 --- a/src/version.c +++ b/src/version.c @@ -676,6 +676,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 268, /**/ 267, /**/ -- cgit v1.2.1