Mercurial > vim

diff src/ex_getln.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 d7c47e45bcc3
children 14d2a210fab1
line wrap: on
line diff
--- 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.