From d979d64fa269ff47a96fc6aed2f4cdd066753c0c Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 4 Mar 2022 14:51:06 +0000 Subject: [PATCH] patch 8.2.4502: in the GUI a modifier is not recognized after CTRL-X Problem: In the GUI a modifier is not recognized for the key typed after CTRL-X, which may result in a mapping to be used. (Daniel Steinberg) Solution: Recognize a modifier starting with CSI. (closes #9889) --- src/getchar.c | 2 +- src/testdir/test_ins_complete.vim | 13 ++++++++++++- src/version.c | 2 ++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/getchar.c b/src/getchar.c index 9939bbdbc..2fbbd4f6e 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -2331,7 +2331,7 @@ at_ctrl_x_key(void) int c = *p; if (typebuf.tb_len > 3 - && c == K_SPECIAL + && (c == K_SPECIAL || c == CSI) // CSI is used by the GUI && p[1] == KS_MODIFIER && (p[2] & MOD_MASK_CTRL)) c = p[3] & 0x1f; diff --git a/src/testdir/test_ins_complete.vim b/src/testdir/test_ins_complete.vim index 033bb37f1..3712abe69 100644 --- a/src/testdir/test_ins_complete.vim +++ b/src/testdir/test_ins_complete.vim @@ -1294,7 +1294,18 @@ func Test_z1_complete_no_history() exe "normal owh\\" exe "normal owh\" call assert_equal(currmess, execute('messages')) - close! + bwipe! +endfunc + +" A mapping is not used for the key after CTRL-X. +func Test_no_mapping_for_ctrl_x_key() + new + inoremap let was_mapped = 'yes' + setlocal dictionary=README.txt + call feedkeys("aexam\\ ", 'xt') + call assert_equal('example ', getline(1)) + call assert_false(exists('was_mapped')) + bwipe! endfunc " Test for different ways of setting the 'completefunc' option diff --git a/src/version.c b/src/version.c index 18a0442ee..51dc6de62 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 4502, /**/ 4501, /**/ -- 2.50.1