forked from aniani/vim
patch 9.0.0788: ModeChanged autocmd not executed when Visual ends with CTRL-C
Problem: ModeChanged autocmd not executed when Visual mode is ended with CTRL-C. Solution: Do not trigger the autocmd when got_int is set. (closes #11394)
This commit is contained in:
@@ -330,6 +330,7 @@ get_last_leader_offset(char_u *line, char_u **flags)
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Return the number of window lines occupied by buffer line "lnum".
|
* Return the number of window lines occupied by buffer line "lnum".
|
||||||
|
* Includes any filler lines.
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
plines(linenr_T lnum)
|
plines(linenr_T lnum)
|
||||||
@@ -349,6 +350,10 @@ plines_win(
|
|||||||
return plines_win_nofill(wp, lnum, winheight) + diff_check_fill(wp, lnum);
|
return plines_win_nofill(wp, lnum, winheight) + diff_check_fill(wp, lnum);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Return the number of window lines occupied by buffer line "lnum".
|
||||||
|
* Does not include filler lines.
|
||||||
|
*/
|
||||||
int
|
int
|
||||||
plines_nofill(linenr_T lnum)
|
plines_nofill(linenr_T lnum)
|
||||||
{
|
{
|
||||||
@@ -2754,7 +2759,9 @@ may_trigger_modechanged()
|
|||||||
char_u curr_mode[MODE_MAX_LENGTH];
|
char_u curr_mode[MODE_MAX_LENGTH];
|
||||||
char_u pattern_buf[2 * MODE_MAX_LENGTH];
|
char_u pattern_buf[2 * MODE_MAX_LENGTH];
|
||||||
|
|
||||||
if (!has_modechanged())
|
// Skip this when got_int is set, the autocommand will not be executed.
|
||||||
|
// Better trigger it next time.
|
||||||
|
if (!has_modechanged() || got_int)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
get_mode(curr_mode);
|
get_mode(curr_mode);
|
||||||
|
@@ -3429,6 +3429,18 @@ func Test_mode_changes()
|
|||||||
unlet g:n_to_c
|
unlet g:n_to_c
|
||||||
unlet g:c_to_n
|
unlet g:c_to_n
|
||||||
|
|
||||||
|
let g:n_to_v = 0
|
||||||
|
au ModeChanged n:v let g:n_to_v += 1
|
||||||
|
let g:v_to_n = 0
|
||||||
|
au ModeChanged v:n let g:v_to_n += 1
|
||||||
|
let g:mode_seq += ['v', 'n']
|
||||||
|
call feedkeys("v\<C-C>", 'tnix')
|
||||||
|
call assert_equal(len(g:mode_seq) - 1, g:index)
|
||||||
|
call assert_equal(1, g:n_to_v)
|
||||||
|
call assert_equal(1, g:v_to_n)
|
||||||
|
unlet g:n_to_v
|
||||||
|
unlet g:v_to_n
|
||||||
|
|
||||||
au! ModeChanged
|
au! ModeChanged
|
||||||
delfunc TestMode
|
delfunc TestMode
|
||||||
unlet! g:mode_seq
|
unlet! g:mode_seq
|
||||||
|
@@ -695,6 +695,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 */
|
||||||
|
/**/
|
||||||
|
788,
|
||||||
/**/
|
/**/
|
||||||
787,
|
787,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user