summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/eval.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c
index 50e87081f..e6175f6ba 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -11941,7 +11941,8 @@ getpos_both(argvars, rettv, getcurpos)
#endif
(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);
}
else
rettv->vval.v_number = FALSE;
diff --git a/src/version.c b/src/version.c
index 1367621f4..7a54fc285 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 578,
+/**/
577,
/**/
576,