From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 2 Oct 2007 20:08:54 +0000 (+0000)
Subject: updated for version 7.1-132
X-Git-Tag: v7.1.132
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e65f732db387c5ee4936b67e789a0cd3aad8d959;p=vim

updated for version 7.1-132
---

diff --git a/src/eval.c b/src/eval.c
index 740b8dd41..ca9e2dcc1 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 a8de5b3f1..e009adbd0 100644
--- 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,
 /**/