0
0
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00

patch 8.2.3903: "gM" does not count tabs as expected

Problem:    "gM" does not count tabs as expected.
Solution:   Use linetabsize() instead of mb_string2cells(). (closes #9409)
This commit is contained in:
Bram Moolenaar
2021-12-26 15:00:07 +00:00
parent 9c23f9bb5f
commit 71c41255f6
3 changed files with 11 additions and 6 deletions

View File

@@ -6122,14 +6122,9 @@ nv_g_cmd(cmdarg_T *cap)
case 'M':
{
char_u *ptr = ml_get_curline();
oap->motion_type = MCHAR;
oap->inclusive = FALSE;
if (has_mbyte)
i = mb_string2cells(ptr, (int)STRLEN(ptr));
else
i = (int)STRLEN(ptr);
i = linetabsize(ml_get_curline());
if (cap->count0 > 0 && cap->count0 <= 100)
coladvance((colnr_T)(i * cap->count0 / 100));
else

View File

@@ -2580,7 +2580,15 @@ func Test_normal33_g_cmd2()
call assert_equal(87, col('.'))
call assert_equal('E', getreg(0))
" Test for gM with Tab characters
call setline('.', "\ta\tb\tc\td\te\tf")
norm! gMyl
call assert_equal(6, col('.'))
call assert_equal("c", getreg(0))
" Test for g Ctrl-G
call setline('.', lineC)
norm! 60gMyl
set ff=unix
let a=execute(":norm! g\<c-g>")
call assert_match('Col 87 of 144; Line 2 of 2; Word 1 of 1; Byte 88 of 146', a)

View File

@@ -749,6 +749,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
3903,
/**/
3902,
/**/