mirror of
https://github.com/vim/vim.git
synced 2025-09-27 04:14:06 -04:00
patch 8.1.0504: when CTRL-C is mapped it triggers InsertLeave
Problem: When CTRL-C is mapped it triggers InsertLeave. Solution: Make CTRL-C behave the same way when typed or used in a mapping.
This commit is contained in:
@@ -1048,7 +1048,10 @@ doESCkey:
|
|||||||
|
|
||||||
if (ins_esc(&count, cmdchar, nomove))
|
if (ins_esc(&count, cmdchar, nomove))
|
||||||
{
|
{
|
||||||
if (cmdchar != 'r' && cmdchar != 'v')
|
// When CTRL-C was typed got_int will be set, with the result
|
||||||
|
// that the autocommands won't be executed. When mapped got_int
|
||||||
|
// is not set, but let's keep the behavior the same.
|
||||||
|
if (cmdchar != 'r' && cmdchar != 'v' && c != Ctrl_C)
|
||||||
ins_apply_autocmds(EVENT_INSERTLEAVE);
|
ins_apply_autocmds(EVENT_INSERTLEAVE);
|
||||||
did_cursorhold = FALSE;
|
did_cursorhold = FALSE;
|
||||||
return (c == Ctrl_O);
|
return (c == Ctrl_O);
|
||||||
@@ -2408,7 +2411,7 @@ has_compl_option(int dict_opt)
|
|||||||
int
|
int
|
||||||
vim_is_ctrl_x_key(int c)
|
vim_is_ctrl_x_key(int c)
|
||||||
{
|
{
|
||||||
/* Always allow ^R - let it's results then be checked */
|
// Always allow ^R - let its results then be checked
|
||||||
if (c == Ctrl_R)
|
if (c == Ctrl_R)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
||||||
|
@@ -1409,3 +1409,33 @@ func Test_edit_alt()
|
|||||||
bwipe XAltFile
|
bwipe XAltFile
|
||||||
call delete('XAltFile')
|
call delete('XAltFile')
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_leave_insert_autocmd()
|
||||||
|
new
|
||||||
|
au InsertLeave * let g:did_au = 1
|
||||||
|
let g:did_au = 0
|
||||||
|
call feedkeys("afoo\<Esc>", 'tx')
|
||||||
|
call assert_equal(1, g:did_au)
|
||||||
|
call assert_equal('foo', getline(1))
|
||||||
|
|
||||||
|
let g:did_au = 0
|
||||||
|
call feedkeys("Sbar\<C-C>", 'tx')
|
||||||
|
call assert_equal(0, g:did_au)
|
||||||
|
call assert_equal('bar', getline(1))
|
||||||
|
|
||||||
|
inoremap x xx<Esc>
|
||||||
|
let g:did_au = 0
|
||||||
|
call feedkeys("Saax", 'tx')
|
||||||
|
call assert_equal(1, g:did_au)
|
||||||
|
call assert_equal('aaxx', getline(1))
|
||||||
|
|
||||||
|
inoremap x xx<C-C>
|
||||||
|
let g:did_au = 0
|
||||||
|
call feedkeys("Sbbx", 'tx')
|
||||||
|
call assert_equal(0, g:did_au)
|
||||||
|
call assert_equal('bbxx', getline(1))
|
||||||
|
|
||||||
|
bwipe!
|
||||||
|
au! InsertLeave
|
||||||
|
iunmap x
|
||||||
|
endfunc
|
||||||
|
@@ -792,6 +792,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
504,
|
||||||
/**/
|
/**/
|
||||||
503,
|
503,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user