From e0a48bf8f80853f64e90acbadc93668c6fb73deb Mon Sep 17 00:00:00 2001 From: edyfox Date: Wed, 3 Oct 2007 05:25:40 +0000 Subject: [PATCH] Merged from the latest developing branch. git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@582 2a77ed30-b011-0410-a7ad-c7884a0aa172 --- src/eval.c | 3 ++- src/option.c | 2 ++ src/version.c | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) 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/option.c b/src/option.c index a8aded52..d0fc1b20 100644 --- a/src/option.c +++ b/src/option.c @@ -8753,6 +8753,8 @@ put_setbool(fd, cmd, name, value) char *name; int value; { + if (value < 0) /* global/local option using global value */ + return OK; if (fprintf(fd, "%s %s%s", cmd, value ? "" : "no", name) < 0 || put_eol(fd) < 0) return FAIL; diff --git a/src/version.c b/src/version.c index 0f960a73..e009adbd 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,10 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 132, +/**/ + 131, +/**/ 130, /**/ 129, -- 2.11.4.GIT