Patch 9.0.0660

[Bram Moolenaar]

Patch 9.0.0660
Problem: Mapping with CTRL keys does not work in the GUI.
Solution: Recognize CSI next to K_SPECIAL. (closes #11275, closes #11270)
Files: src/map.c, src/testdir/test_gui.vim


*** ../vim-9.0.0659/src/map.c 2022-10-04 16:23:39.018042176 +0100
--- src/map.c 2022-10-04 20:12:21.030068819 +0100
***************
*** 1753,1759 ****
d = res;
for (s = p; *s != NUL; )
{
! if (s[0] == K_SPECIAL && s[1] != NUL && s[2] != NUL)
{
// Copy special key unmodified.
*d++ = *s++;
--- 1753,1763 ----
d = res;
for (s = p; *s != NUL; )
{
! if ((s[0] == K_SPECIAL
! #ifdef FEAT_GUI
! || (gui.in_use && s[0] == CSI)
! #endif
! ) && s[1] != NUL && s[2] != NUL)
{
// Copy special key unmodified.
*d++ = *s++;
*** ../vim-9.0.0659/src/testdir/test_gui.vim 2022-09-28 21:06:30.634345977 +0100
--- src/testdir/test_gui.vim 2022-10-04 20:09:34.826105003 +0100
***************
*** 1732,1735 ****
--- 1732,1754 ----
bw!
endfunc

+ func Test_gui_macro_csi()
+ " Test for issue #11270
+ nnoremap <C-L> <Cmd>let g:triggered = 1<CR>
+ let @q = "\x9b\xfc\x04L"
+ norm @q
+ call assert_equal(1, g:triggered)
+ unlet g:triggered
+ nunmap <C-L>
+
+ " Test for issue #11057
+ inoremap <C-D>t bbb
+ call setline(1, "\t")
+ let @q = "i\x9b\xfc\x04D"
+ " The end of :normal is like a mapping timing out
+ norm @q
+ call assert_equal('', getline(1))
+ iunmap <C-D>t
+ endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
*** ../vim-9.0.0659/src/version.c 2022-10-04 18:41:22.481406918 +0100
--- src/version.c 2022-10-04 20:11:13.706092942 +0100
***************
*** 701,702 ****
--- 701,704 ----
{ /* Add new patch number below this line */
+ /**/
+ 660,
/**/

--
MAN: Fetchez la vache!
GUARD: Quoi?
MAN: Fetchez la vache!
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///