From 38571a04b4eb2853f46df8884750bcb9a8115db8 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 26 Nov 2019 14:28:15 +0100
Subject: 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 #5266)
            Also fix CTRL-G in Insert mode.
---
 src/ex_getln.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/ex_getln.c')

diff --git a/src/ex_getln.c b/src/ex_getln.c
index 0a3d9d4da..683215874 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -1747,6 +1747,7 @@ getcmdline_int(
 #endif
 		putcmdline('"', TRUE);
 		++no_mapping;
+		++allow_keys;
 		i = c = plain_vgetc();	/* CTRL-R <char> */
 		if (i == Ctrl_O)
 		    i = Ctrl_R;		/* CTRL-R CTRL-O == CTRL-R CTRL-R */
@@ -1754,6 +1755,7 @@ getcmdline_int(
 		    c = plain_vgetc();	/* CTRL-R CTRL-R <char> */
 		extra_char = NUL;
 		--no_mapping;
+		--allow_keys;
 #ifdef FEAT_EVAL
 		/*
 		 * Insert the result of an expression.
-- 
cgit v1.2.1