Patch 8.1.2333
Problem: With modifyOtherKeys CTRL-^ doesn't work.
Solution: Handle the exception.
Files: src/getchar.c, src/testdir/test_termcodes.vim
*** ../vim-8.1.2332/src/getchar.c 2019-11-02 22:54:37.397188845 +0100
--- src/getchar.c 2019-11-21 23:23:35.759613716 +0100
***************
*** 1768,1779 ****
{
// A modifier was not used for a mapping, apply it to ASCII
// keys. Shift would already have been applied.
! if ((mod_mask & MOD_MASK_CTRL)
! && ((c >= '`' && c <= 0x7f)
! || (c >= '@' && c <= '_')))
{
! c &= 0x1f;
! mod_mask &= ~MOD_MASK_CTRL;
}
if ((mod_mask & (MOD_MASK_META | MOD_MASK_ALT))
&& c >= 0 && c <= 127)
--- 1768,1786 ----
{
// A modifier was not used for a mapping, apply it to ASCII
// keys. Shift would already have been applied.
! if (mod_mask & MOD_MASK_CTRL)
{
! if ((c >= '`' && c <= 0x7f) || (c >= '@' && c <= '_'))
! {
! c &= 0x1f;
! mod_mask &= ~MOD_MASK_CTRL;
! }
! else if (c == '6')
! {
! // CTRL-6 is equivalent to CTRL-^
! c = 0x1e;
! mod_mask &= ~MOD_MASK_CTRL;
! }
}
if ((mod_mask & (MOD_MASK_META | MOD_MASK_ALT))
&& c >= 0 && c <= 127)
*** ../vim-8.1.2332/src/testdir/test_termcodes.vim 2019-11-16
18:57:12.577165165 +0100
--- src/testdir/test_termcodes.vim 2019-11-21 23:21:50.215334516 +0100
***************
*** 1192,1197 ****
--- 1192,1205 ----
call feedkeys('a' .. a:func('X', 9) .. "\<Esc>", 'Lx!')
call assert_equal("Ø", getline(1))
+ " Ctrl-6 is Ctrl-^
+ split aaa
+ edit bbb
+ call feedkeys(a:func('6', 5), 'Lx!')
+ call assert_equal("aaa", bufname())
+ bwipe aaa
+ bwipe bbb
+
bwipe!
set timeoutlen&
endfunc
*** ../vim-8.1.2332/src/version.c 2019-11-21 22:27:18.155184143 +0100
--- src/version.c 2019-11-21 23:15:07.853043783 +0100
***************
*** 739,740 ****
--- 739,742 ----
{ /* Add new patch number below this line */
+ /**/
+ 2333,
/**/
--
A meeting is an event at which the minutes are kept and the hours are lost.
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/201911212224.xALMOSXZ030285%40masaka.moolenaar.net.
