updated for version 7.1-132

diff --git a/src/eval.c b/src/eval.c
index 740b8dd41ff5d230b989114436ddc08fca3bf74f..ca9e2dcc13ef94c5238196bf98d8de89f4230a21 100644 (file)
--- 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 a8de5b3f107c96ad32207f184e7b9fe5e1c19bbe..e009adbd087ea3a85b3e369cee02cfb7a5e332cb 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    132,
 /**/
     131,
 /**/