aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.2.4837: modifiers not simplified when timed out

Browse Source 
Problem:    Modifiers not simplified when timed out or using feedkeys() with
            'n" flag.
Solution:   Adjust how mapped flag and timeout are used. (closes #10305)
This commit is contained in:
zeertzjq
2022-04-28 14:10:01 +01:00
committed by Bram Moolenaar
parent f6ced9863f
commit 68a573ce2b
4 changed files with 89 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/getchar.c
View File

@@ -2699,17 +2699,19 @@ handle_mapping(
* - and not an ESC sequence, not in insert mode or p_ek is on,
* - and when not timed out,
*/
if ((no_mapping == 0 || allow_keys != 0)
&& (typebuf.tb_maplen == 0
if (no_mapping == 0 || allow_keys != 0)
{
if ((typebuf.tb_maplen == 0
|| (p_remap && typebuf.tb_noremap[
typebuf.tb_off] == RM_YES))
&& !*timedout)
{
keylen = check_termcode(max_mlen + 1, NULL, 0, NULL);
keylen = check_termcode(max_mlen + 1, NULL, 0, NULL);
else
keylen = 0;
// If no termcode matched but 'pastetoggle' matched partially
// it's like an incomplete key sequence.
if (keylen == 0 && save_keylen == KEYLEN_PART_KEY)
if (keylen == 0 && save_keylen == KEYLEN_PART_KEY && !*timedout)
keylen = KEYLEN_PART_KEY;
// If no termcode matched, try to include the modifier into the