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 #10313)

diff --git a/src/getchar.c b/src/getchar.c
index 2b1bbde4b0da20701742afd4111535dcf98d857a..6d8697c376ab58364ede4957166b3a9c0f4a3879 100644 (file)
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -1634,7 +1634,7 @@ merge_modifyOtherKeys(int c_arg, int *modifiers)
 {
     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
index 4ae01b85518528a3f14f4cf1bcbdc3696bfb267c..96723b668e1ca335d3e2835e2909fdf934a92798 100644 (file)
--- 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
index ab771fef13ddaee72829c8b7d58db97a8d840b63..55409858537679dac7f31197cbeb7a30ed61e28d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4844,
 /**/
     4843,
 /**/