diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/getchar.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_gui.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/src/getchar.c b/src/getchar.c index 2b1bbde4b..6d8697c37 100644 --- 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 4ae01b855..96723b668 100644 --- 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 ab771fef1..554098585 100644 --- 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, |