Patch 8.2.4846 (after 8.2.4844)
Problem: Termcodes test fails.
Solution: use CTRL-SHIFT-V to insert an unsimplified key. (closes #10316)
Files: runtime/doc/cmdline.txt, src/edit.c, src/getchar.c,
src/testdir/test_gui.vim
*** ../vim-8.2.4845/runtime/doc/cmdline.txt 2022-04-09 21:41:22.262689600
+0100
--- runtime/doc/cmdline.txt 2022-04-29 16:41:38.215390183 +0100
***************
*** 87,92 ****
--- 87,93 ----
CTRL-SHIFT-V *c_CTRL-SHIFT-V* *c_CTRL-SHIFT-Q*
CTRL-SHIFT-Q Works just like CTRL-V, unless |modifyOtherKeys| is active,
then it inserts the Escape sequence for a key with modifiers.
+ In the GUI the |key-notation| is inserted without simplifying.
*c_<Left>* *c_Left*
<Left> cursor left
*** ../vim-8.2.4845/src/edit.c 2022-04-15 13:53:30.044708701 +0100
--- src/edit.c 2022-04-29 16:38:47.983643660 +0100
***************
*** 1899,1905 ****
--- 1899,1909 ----
* vi-compatible (maybe there should be an option for it?) -- webb
*/
if (gui.in_use)
+ {
++allow_keys;
+ if (noReduceKeys)
+ ++no_reduce_keys;
+ }
#endif
#ifdef USE_ON_FLY_SCROLL
dont_scroll = TRUE; // disallow scrolling here
***************
*** 1992,1998 ****
--- 1996,2006 ----
--no_mapping;
#ifdef FEAT_GUI
if (gui.in_use)
+ {
--allow_keys;
+ if (noReduceKeys)
+ --no_reduce_keys;
+ }
#endif
if (nc)
{
*** ../vim-8.2.4845/src/getchar.c 2022-04-29 11:06:30.746054573 +0100
--- src/getchar.c 2022-04-29 16:38:47.983643660 +0100
***************
*** 1634,1640 ****
{
int c = c_arg;
! if ((*modifiers & MOD_MASK_CTRL) && !(*modifiers & MOD_MASK_SHIFT))
{
if ((c >= '`' && c <= 0x7f) || (c >= '@' && c <= '_'))
{
--- 1634,1640 ----
{
int c = c_arg;
! if (*modifiers & MOD_MASK_CTRL)
{
if ((c >= '`' && c <= 0x7f) || (c >= '@' && c <= '_'))
{
*** ../vim-8.2.4845/src/testdir/test_gui.vim 2022-04-29 11:06:30.746054573
+0100
--- src/testdir/test_gui.vim 2022-04-29 16:38:47.983643660 +0100
***************
*** 1560,1567 ****
bw!
endfunc
! func Test_gui_CTRL_V()
! call feedkeys(":let g:str = '\<C-V>\<*C-S-I>\<C-V>\<*C-S-@>'\<CR>", 'tx')
call assert_equal('<C-S-I><C-S-@>', g:str)
unlet g:str
endfunc
--- 1560,1567 ----
bw!
endfunc
! func Test_gui_CTRL_SHIFT_V()
! call feedkeys(":let g:str = '\<*C-S-V>\<*C-S-I>\<*C-S-V>\<*C-S-@>'\<CR>",
'tx')
call assert_equal('<C-S-I><C-S-@>', g:str)
unlet g:str
endfunc
*** ../vim-8.2.4845/src/version.c 2022-04-29 11:29:49.956300682 +0100
--- src/version.c 2022-04-29 16:40:41.827475237 +0100
***************
*** 748,749 ****
--- 748,751 ----
{ /* Add new patch number below this line */
+ /**/
+ 4846,
/**/
--
>From "know your smileys":
!-| I-am-a-Cylon-Centurian-with-one-red-eye-bouncing-back-and-forth
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ 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/20220429154604.5526F1C0255%40moolenaar.net.
