Mercurial > vim

diff src/edit.c @ 18709:ac08c7ad9d37 v8.1.2346

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.2346: CTRL-R CTRL-R doesn't work with modifyOtherKeys Commit: https://github.com/vim/vim/commit/38571a04b4eb2853f46df8884750bcb9a8115db8 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Nov 26 14:28:15 2019 +0100 patch 8.1.2346: CTRL-R CTRL-R doesn't work with modifyOtherKeys Problem: CTRL-R CTRL-R doesn't work with modifyOtherKeys. Solution: Allow key codes when fetching argument for CTRL-R. (closes https://github.com/vim/vim/issues/5266) Also fix CTRL-G in Insert mode.
author Bram Moolenaar <Bram@vim.org>
date Tue, 26 Nov 2019 14:30:03 +0100
parents df141c730008
children 14d2a210fab1
line wrap: on
line diff
--- 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 */