To: vim_dev@googlegroups.com Subject: Patch 8.2.4844 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.4844 Problem: is simplified to . Solution: Do not simplify CTRL if there is also SHIFT. (closes #10313) Files: src/getchar.c, src/testdir/test_gui.vim *** ../vim-8.2.4843/src/getchar.c 2022-04-28 14:09:56.075947128 +0100 --- src/getchar.c 2022-04-29 11:01:00.614740696 +0100 *************** *** 1634,1640 **** { int c = c_arg; ! if (*modifiers & MOD_MASK_CTRL) { if ((c >= '`' && c <= 0x7f) || (c >= '@' && c <= '_')) { --- 1634,1640 ---- { int c = c_arg; ! if ((*modifiers & MOD_MASK_CTRL) && !(*modifiers & MOD_MASK_SHIFT)) { if ((c >= '`' && c <= 0x7f) || (c >= '@' && c <= '_')) { *** ../vim-8.2.4843/src/testdir/test_gui.vim 2022-04-03 18:01:39.659574455 +0100 --- src/testdir/test_gui.vim 2022-04-29 11:01:00.618740687 +0100 *************** *** 1560,1563 **** --- 1560,1569 ---- bw! endfunc + func Test_gui_CTRL_V() + call feedkeys(":let g:str = '\\<*C-S-I>\\<*C-S-@>'\", 'tx') + call assert_equal('', g:str) + unlet g:str + endfunc + " vim: shiftwidth=2 sts=2 expandtab *** ../vim-8.2.4843/src/version.c 2022-04-28 19:50:48.158411708 +0100 --- src/version.c 2022-04-29 11:03:14.410462563 +0100 *************** *** 748,749 **** --- 748,751 ---- { /* Add new patch number below this line */ + /**/ + 4844, /**/ -- From "know your smileys": :-) Funny |-) Funny Oriental (-: Funny Australian /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///