# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1651227303 -7200
# Node ID fdb18b1122f7a7cadbae919b6873ae81ad15508d
# Parent  952884eba10d559c6f379dcd9d9b65d4d516fe73
patch 8.2.4844: <C-S-I> is simplified to <S-Tab>

Commit: https://github.com/vim/vim/commit/758a8d199988b5b25566b2820db60dc2c9de3e58
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Fri Apr 29 11:06:34 2022 +0100

    patch 8.2.4844: <C-S-I> is simplified to <S-Tab>

    Problem:    <C-S-I> is simplified to <S-Tab>.
    Solution:   Do not simplify CTRL if there is also SHIFT. (closes https://github.com/vim/vim/issues/10313)

diff --git a/src/getchar.c b/src/getchar.c
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -1634,7 +1634,7 @@ merge_modifyOtherKeys(int c_arg, int *mo
 {
     int c = c_arg;
 
-    if (*modifiers & MOD_MASK_CTRL)
+    if ((*modifiers & MOD_MASK_CTRL) && !(*modifiers & MOD_MASK_SHIFT))
     {
 	if ((c >= '`' && c <= 0x7f) || (c >= '@' && c <= '_'))
 	{
diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -1560,4 +1560,10 @@ func Test_gui_findrepl()
   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
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4844,
+/**/
     4843,
 /**/
     4842,