updated for version 7.1-132v7.1.132v7-1-132

2 files changed, 4 insertions, 1 deletions

diff --git a/src/eval.c b/src/eval.c
index 740b8dd4..ca9e2dcc 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -10388,7 +10388,8 @@ f_getpos(argvars, rettv)
 	    list_append_number(l, (varnumber_T)0);
 	list_append_number(l, (fp != NULL) ? (varnumber_T)fp->lnum
 							    : (varnumber_T)0);
-	list_append_number(l, (fp != NULL) ? (varnumber_T)fp->col + 1
+	list_append_number(l, (fp != NULL)
+		     ? (varnumber_T)(fp->col == MAXCOL ? MAXCOL : fp->col + 1)
 							    : (varnumber_T)0);
 	list_append_number(l,
 #ifdef FEAT_VIRTUALEDIT
diff --git a/src/version.c b/src/version.c
index a8de5b3f..e009adbd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    132,
+/**/
     131,
 /**/
     130,