diff options
| -rw-r--r-- | src/nvim/eval.c | 4 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 87bd058c9e..9b4b4ce496 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -9479,7 +9479,9 @@ static void getpos_both(typval_T *argvars, typval_T *rettv, bool getcurpos) list_append_number(l, (fp != NULL) ? (varnumber_T)fp->coladd : (varnumber_T)0); if (getcurpos) { - list_append_number(l, (varnumber_T) curwin->w_curswant + 1); + list_append_number(l, curwin->w_curswant == MAXCOL + ? (varnumber_T)MAXCOL + : (varnumber_T)curwin->w_curswant + 1); } } diff --git a/src/nvim/version.c b/src/nvim/version.c index 8abbdb8a8b..8357de9f46 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -206,7 +206,7 @@ static int included_patches[] = { //581, //580, //579, - //578, + 578, //577, //576, //575, |