diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2021-08-11 17:38:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-11 17:38:36 +0200 |
| commit | 7d2233fad007a3dd42481f8ffc01e69b57a17f9e (patch) | |
| tree | a539fc5a49b000086de4a0ab7c6fbd49e8de9ab8 /src/nvim/eval/funcs.c | |
| parent | 2c60f7c99188e90739d83f3c131134b71cd37436 (diff) | |
| parent | 28b5c73bf8b5cc92451a4030b4ffbbad6c56374b (diff) | |
| download | rneovim-7d2233fad007a3dd42481f8ffc01e69b57a17f9e.tar.gz rneovim-7d2233fad007a3dd42481f8ffc01e69b57a17f9e.tar.bz2 rneovim-7d2233fad007a3dd42481f8ffc01e69b57a17f9e.zip | |
Merge pull request #15336 from bfredl/plines
refactor(plines): move "plines" (size of printed lines) family of function to own file
Diffstat (limited to 'src/nvim/eval/funcs.c')
| -rw-r--r-- | src/nvim/eval/funcs.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 21c858373c..4e409cca50 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -47,6 +47,7 @@ #include "nvim/os/input.h" #include "nvim/os/shell.h" #include "nvim/path.h" +#include "nvim/plines.h" #include "nvim/popupmnu.h" #include "nvim/quickfix.h" #include "nvim/regexp.h" @@ -1055,8 +1056,10 @@ static void f_col(typval_T *argvars, typval_T *rettv, FunPtr fptr) if (virtual_active() && fp == &curwin->w_cursor) { char_u *p = get_cursor_pos_ptr(); - if (curwin->w_cursor.coladd >= (colnr_T)chartabsize(p, - curwin->w_virtcol - curwin->w_cursor.coladd)) { + if (curwin->w_cursor.coladd + >= (colnr_T)win_chartabsize(curwin, p, + (curwin->w_virtcol + - curwin->w_cursor.coladd))) { int l; if (*p != NUL && p[(l = (*mb_ptr2len)(p))] == NUL) |