diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-03-13 12:06:07 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-03-13 12:06:07 +0000 |
| commit | 986b0fd0c550d9834a3cc45dd87555c13152c391 (patch) | |
| tree | b3530c9948abf4198766e3695bd5402028fd1972 | |
| parent | badf04f5c219743cd6645ff1f1fe88badf4af4c5 (diff) | |
| download | vim-git-986b0fd0c550d9834a3cc45dd87555c13152c391.tar.gz | |
patch 8.2.4555: getmousepos() returns the wrong columnv8.2.4555
Problem: getmousepos() returns the wrong column. (Ernie Rael)
Solution: Limit to the text size, not the number of bytes.
| -rw-r--r-- | src/mouse.c | 7 | ||||
| -rw-r--r-- | src/testdir/test_functions.vim | 26 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 30 insertions, 5 deletions
diff --git a/src/mouse.c b/src/mouse.c index 6a32cac9d..a094df6bb 100644 --- a/src/mouse.c +++ b/src/mouse.c @@ -3099,17 +3099,14 @@ f_getmousepos(typval_T *argvars UNUSED, typval_T *rettv) col -= left_off; 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, NULL); - // 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; } } diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim index e22a0c6ba..ce868c20a 100644 --- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -2750,6 +2750,32 @@ func Test_getcurpos_setpos() call assert_equal([0, 0, 0, 0, 0], getcurpos(1999)) endfunc +func Test_getmousepos() + enew! + call setline(1, "\t\t\t1234") + call test_setmouse(1, 25) + call assert_equal(#{ + \ screenrow: 1, + \ screencol: 25, + \ winid: win_getid(), + \ winrow: 1, + \ wincol: 25, + \ line: 1, + \ column: 25, + \ }, getmousepos()) + call test_setmouse(1, 50) + call assert_equal(#{ + \ screenrow: 1, + \ screencol: 50, + \ winid: win_getid(), + \ winrow: 1, + \ wincol: 50, + \ line: 1, + \ column: 29, + \ }, getmousepos()) + bwipe! +endfunc + " Test for glob() func Test_glob() call assert_equal('', glob(test_null_string())) diff --git a/src/version.c b/src/version.c index bdd9dd8f3..20b5a03a3 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4555, +/**/ 4554, /**/ 4553, |