1
0
forked from aniani/vim

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)
This commit is contained in:
Bram Moolenaar
2022-03-04 14:51:06 +00:00
parent 21efafe4c2
commit d979d64fa2
3 changed files with 15 additions and 2 deletions

View File

@@ -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;

View File

@@ -1294,7 +1294,18 @@ func Test_z1_complete_no_history()
exe "normal owh\<C-X>\<C-K>"
exe "normal owh\<C-N>"
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 <C-K> <Cmd>let was_mapped = 'yes'<CR>
setlocal dictionary=README.txt
call feedkeys("aexam\<C-X>\<C-K> ", 'xt')
call assert_equal('example ', getline(1))
call assert_false(exists('was_mapped'))
bwipe!
endfunc
" Test for different ways of setting the 'completefunc' option

View File

@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
4502,
/**/
4501,
/**/