aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.1.0580: :lmap mapping for keypad key not applied when typed in Select mode

Browse Source 
Problem:  An :lmap mapping for a printable keypad key is not applied
          when typing it in Select mode.
Solution: Change keypad key to ASCII after setting vgetc_char.
          (zeertzjq)

closes: #15245

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq 2024-07-13 19:06:44 +02:00 committed by Christian Brabandt
parent d1b5ea984d
commit 90a800274d
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
3 changed files with 55 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/getchar.c
View File

@ -1999,6 +1999,43 @@ vgetc(void)
#endif #endif
} }
// For a multi-byte character get all the bytes and return the
// converted character.
// Note: This will loop until enough bytes are received!
if (has_mbyte && (n = MB_BYTE2LEN_CHECK(c)) > 1)
{
++no_mapping;
buf[0] = c;
for (i = 1; i < n; ++i)
{
buf[i] = vgetorpeek(TRUE);
if (buf[i] == K_SPECIAL
#ifdef FEAT_GUI
|| (buf[i] == CSI)
#endif
)
{
// Must be a K_SPECIAL - KS_SPECIAL - KE_FILLER
// sequence, which represents a K_SPECIAL (0x80),
// or a CSI - KS_EXTRA - KE_CSI sequence, which
// represents a CSI (0x9B),
// or a K_SPECIAL - KS_EXTRA - KE_CSI, which is CSI
// too.
c = vgetorpeek(TRUE);
if (vgetorpeek(TRUE) == KE_CSI && c == KS_EXTRA)
buf[i] = CSI;
}
}
--no_mapping;
c = (*mb_ptr2char)(buf);
}
if (vgetc_char == 0)
{
vgetc_mod_mask = mod_mask;
vgetc_char = c;
}
// a keypad or special function key was not mapped, use it like // a keypad or special function key was not mapped, use it like
// its ASCII equivalent // its ASCII equivalent
switch (c) switch (c)
@ -2062,43 +2099,6 @@ vgetc(void)
case K_XRIGHT: c = K_RIGHT; break; case K_XRIGHT: c = K_RIGHT; break;
} }
// For a multi-byte character get all the bytes and return the
// converted character.
// Note: This will loop until enough bytes are received!
if (has_mbyte && (n = MB_BYTE2LEN_CHECK(c)) > 1)
{
++no_mapping;
buf[0] = c;
for (i = 1; i < n; ++i)
{
buf[i] = vgetorpeek(TRUE);
if (buf[i] == K_SPECIAL
#ifdef FEAT_GUI
|| (buf[i] == CSI)
#endif
)
{
// Must be a K_SPECIAL - KS_SPECIAL - KE_FILLER
// sequence, which represents a K_SPECIAL (0x80),
// or a CSI - KS_EXTRA - KE_CSI sequence, which
// represents a CSI (0x9B),
// or a K_SPECIAL - KS_EXTRA - KE_CSI, which is CSI
// too.
c = vgetorpeek(TRUE);
if (vgetorpeek(TRUE) == KE_CSI && c == KS_EXTRA)
buf[i] = CSI;
}
}
--no_mapping;
c = (*mb_ptr2char)(buf);
}
if (vgetc_char == 0)
{
vgetc_mod_mask = mod_mask;
vgetc_char = c;
}
break; break;
} }

16
src/testdir/test_selectmode.vim
View File

@ -321,4 +321,20 @@ func Test_ins_ctrl_o_in_insert_mode_resets_selectmode()
bwipe! bwipe!
endfunc endfunc
" Test that an :lmap mapping for a printable keypad key is applied when typing
" it in Select mode.
func Test_selectmode_keypad_lmap()
new
lnoremap <buffer> <kPoint> ???
lnoremap <buffer> <kEnter> !!!
setlocal iminsert=1
call setline(1, 'abcdef')
call feedkeys("gH\<kPoint>\<Esc>", 'tx')
call assert_equal(['???'], getline(1, '$'))
call feedkeys("gH\<kEnter>\<Esc>", 'tx')
call assert_equal(['!!!'], getline(1, '$'))
bwipe!
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab

2
src/version.c
View File

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