summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-10-02 20:08:54 +0000
committerBram Moolenaar <Bram@vim.org>2007-10-02 20:08:54 +0000
commite65f732db387c5ee4936b67e789a0cd3aad8d959 (patch)
treebf42b7923d599a05ae6e2d0e343c37564b130302 /src
parent893de92ede66e8edbc9bbb47a8a1b664d5262e75 (diff)
downloadvim-git-e65f732db387c5ee4936b67e789a0cd3aad8d959.tar.gz
updated for version 7.1-132v7.1.132
Diffstat (limited to 'src')
-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 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
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 132,
+/**/
131,
/**/
130,