diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2020-01-18 16:12:16 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-18 16:12:16 -0800 |
| commit | fb8b0503baf95ccd9ab4a30220dd08ca8b16736b (patch) | |
| tree | 8106670804b58724a15c64da4473b78393528601 /src/nvim/eval.c | |
| parent | fd89ad7bfb1534c42c99b36ca025ea42ccbee7e1 (diff) | |
| parent | ad35cbca76222deb33357b63a61a29945ef084f7 (diff) | |
| download | rneovim-fb8b0503baf95ccd9ab4a30220dd08ca8b16736b.tar.gz rneovim-fb8b0503baf95ccd9ab4a30220dd08ca8b16736b.tar.bz2 rneovim-fb8b0503baf95ccd9ab4a30220dd08ca8b16736b.zip | |
Merge #11707 from janlazo/vim-8.1.1434
vim-patch:8.1.{716,1139},8.2.{112,120,123}
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 9916ee3bd3..797c61a482 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -16018,7 +16018,7 @@ static void f_setpos(typval_T *argvars, typval_T *rettv, FunPtr fptr) const char *const name = tv_get_string_chk(argvars); if (name != NULL) { if (list2fpos(&argvars[1], &pos, &fnum, &curswant) == OK) { - if (--pos.col < 0) { + if (pos.col != MAXCOL && --pos.col < 0) { pos.col = 0; } if (name[0] == '.' && name[1] == NUL) { @@ -19045,6 +19045,15 @@ static void f_virtcol(typval_T *argvars, typval_T *rettv, FunPtr fptr) fp = var2fpos(&argvars[0], FALSE, &fnum); if (fp != NULL && fp->lnum <= curbuf->b_ml.ml_line_count && fnum == curbuf->b_fnum) { + // Limit the column to a valid value, getvvcol() doesn't check. + if (fp->col < 0) { + fp->col = 0; + } else { + const size_t len = STRLEN(ml_get(fp->lnum)); + if (fp->col > (colnr_T)len) { + fp->col = (colnr_T)len; + } + } getvvcol(curwin, fp, NULL, NULL, &vcol); ++vcol; } |