0
0
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00

updated for version 7.4.573

Problem:    Mapping CTRL-C in Visual mode doesn't work. (Ingo Karkat)
Solution:   Call get_real_state() instead of using State directly.
This commit is contained in:
Bram Moolenaar 2015-01-14 16:08:32 +01:00
parent 84c8e5ab9c
commit 5000869712
4 changed files with 14 additions and 5 deletions

View File

@ -8,7 +8,7 @@ STARTTEST
:inoreab чкпр vim
GAчкпр

:" mapping of ctrl-c in insert mode
:" mapping of ctrl-c in Insert mode
:set cpo-=< cpo-=k
:inoremap <c-c> <ctrl-c>
:cnoremap <c-c> dummy
@ -16,8 +16,14 @@ GAчкпр
GA
TEST2: CTRL-C |A|

:nunmap <c-c>
:unmap <c-c>
:unmap! <c-c>
:"
:" mapping of ctrl-c in Visual mode
:vnoremap <c-c> :<C-u>$put ='vmap works'
GV
:vunmap <c-c>
:"
:" langmap should not get remapped in insert mode
:inoremap { FAIL_ilangmap
:set langmap=+{ langnoremap

View File

@ -2,5 +2,6 @@ test starts here:
vim
TEST2: CTRL-C |<ctrl-c>A|
vmap works
+
+

View File

@ -180,7 +180,7 @@ ui_inchar(buf, maxlen, wtime, tb_change_cnt)
/* ... there is no need for CTRL-C to interrupt something, don't let
* it set got_int when it was mapped. */
if ((mapped_ctrl_c | curbuf->b_mapped_ctrl_c) & State)
if ((mapped_ctrl_c | curbuf->b_mapped_ctrl_c) & get_real_state())
ctrl_c_interrupts = FALSE;
}

View File

@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
573,
/**/
572,
/**/