diff options
author | Sean Dewar <seandewar@users.noreply.github.com> | 2022-03-13 18:01:44 +0000 |
---|---|---|
committer | Sean Dewar <seandewar@users.noreply.github.com> | 2022-03-15 11:39:38 +0000 |
commit | 6906c5759da28f1aaac33c479035b3d06a1699d0 (patch) | |
tree | c212a0efba0bf346c99a9c9eeb745efce6a1096f /src/nvim/eval/funcs.c | |
parent | 9a9b93c48503d5c5a1fa12de66594c77b436bc3c (diff) | |
download | rneovim-6906c5759da28f1aaac33c479035b3d06a1699d0.tar.gz rneovim-6906c5759da28f1aaac33c479035b3d06a1699d0.tar.bz2 rneovim-6906c5759da28f1aaac33c479035b3d06a1699d0.zip |
vim-patch:8.2.4555: getmousepos() returns the wrong column
Problem: getmousepos() returns the wrong column. (Ernie Rael)
Solution: Limit to the text size, not the number of bytes.
https://github.com/vim/vim/commit/986b0fd0c550d9834a3cc45dd87555c13152c391
test_setmouse is N/A; adjust test for Nvim.
N/A patches for version.c:
vim-patch:8.2.4569: Coverity warning for not using a return value
Problem: Coverity warning for not using a return value.
Solution: Add "(void)".
https://github.com/vim/vim/commit/977525fea662b7f37ad0e052894c1f62b5b03269
Diffstat (limited to 'src/nvim/eval/funcs.c')
-rw-r--r-- | src/nvim/eval/funcs.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index b74f9759ac..3bbb4d557e 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -3753,18 +3753,15 @@ static void f_getmousepos(typval_T *argvars, typval_T *rettv, FunPtr fptr) winrow = row + 1 + wp->w_border_adj[0]; // Adjust by 1 for top border wincol = col + 1 + wp->w_border_adj[3]; // Adjust by 1 for left border if (row >= 0 && row < wp->w_height && col >= 0 && col < wp->w_width) { - char_u *p; int count; mouse_comp_pos(wp, &row, &col, &line); - // limit to text length plus one - p = ml_get_buf(wp->w_buffer, line, false); - count = (int)STRLEN(p); + // limit to text size plus one + count = linetabsize(ml_get_buf(wp->w_buffer, line, false)); if (col > count) { col = count; } - column = col + 1; } } |