summaryrefslogtreecommitdiff
path: root/src/edit.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-11-26 14:28:15 +0100
committerBram Moolenaar <Bram@vim.org>2019-11-26 14:28:15 +0100
commit38571a04b4eb2853f46df8884750bcb9a8115db8 (patch)
treeb1d9f7ce21a909af8c54a37047e60ea74ec6329d /src/edit.c
parentc1faf3dc3879e8a5e486f31445b5a5753dcbc6a3 (diff)
downloadvim-git-38571a04b4eb2853f46df8884750bcb9a8115db8.tar.gz
patch 8.1.2346: CTRL-R CTRL-R doesn't work with modifyOtherKeysv8.1.2346
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.
Diffstat (limited to 'src/edit.c')
-rw-r--r--src/edit.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/edit.c b/src/edit.c
index 1c168b6a8..c74f1bb36 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -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 */