thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.2346: CTRL-R CTRL-R doesn't work with modifyOtherKeys

Browse Source 
Problem:    CTRL-R CTRL-R doesn't work with modifyOtherKeys.
Solution:   Allow key codes when fetching argument for CTRL-R. (closes #5266)
            Also fix CTRL-G in Insert mode.
This commit is contained in:
Bram Moolenaar
2019-11-26 14:28:15 +01:00
parent c1faf3dc38
commit 38571a04b4
4 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/edit.c
View File

@@ -3906,6 +3906,7 @@ ins_reg(void)
* deleted when ESC is hit.
*/
++no_mapping;
++allow_keys;
regname = plain_vgetc();
LANGMAP_ADJUST(regname, TRUE);
if (regname == Ctrl_R || regname == Ctrl_O || regname == Ctrl_P)
@@ -3919,6 +3920,7 @@ ins_reg(void)
LANGMAP_ADJUST(regname, TRUE);
}
--no_mapping;
--allow_keys;
#ifdef FEAT_EVAL
/* Don't call u_sync() while typing the expression or giving an error
@@ -4010,8 +4012,10 @@ ins_ctrl_g(void)
* deleted when ESC is hit.
*/
++no_mapping;
++allow_keys;
c = plain_vgetc();
--no_mapping;
--allow_keys;
switch (c)
{
/* CTRL-G k and CTRL-G <Up>: cursor up to Insstart.col */