aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 9.0.1490: the ModeChanged event may be triggered too often

Browse Source 
Problem:    The ModeChanged event may be triggered too often.
Solution:   Only trigger ModeChanged when no operator is pending.
            (closes #12298)
This commit is contained in:
zeertzjq
2023-04-26 16:50:19 +01:00
committed by Bram Moolenaar
parent 2f14716c46
commit 73916bac5a
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/normal.c
View File

@@ -975,12 +975,15 @@ normal_end:
reset_reg_var(); reset_reg_var();
#endif #endif
// Reset finish_op, in case it was set
#ifdef CURSOR_SHAPE #ifdef CURSOR_SHAPE
int prev_finish_op = finish_op; int prev_finish_op = finish_op;
#endif #endif
finish_op = FALSE; if (oap->op_type == OP_NOP)
may_trigger_modechanged(); {
// Reset finish_op, in case it was set
finish_op = FALSE;
may_trigger_modechanged();
}
#ifdef CURSOR_SHAPE #ifdef CURSOR_SHAPE
// Redraw the cursor with another shape, if we were in Operator-pending // Redraw the cursor with another shape, if we were in Operator-pending
// mode or did a replace command. // mode or did a replace command.
@@ -995,7 +998,7 @@ normal_end:
#endif #endif
if (oap->op_type == OP_NOP && oap->regname == 0 if (oap->op_type == OP_NOP && oap->regname == 0
&& ca.cmdchar != K_CURSORHOLD) && ca.cmdchar != K_CURSORHOLD)
clear_showcmd(); clear_showcmd();
checkpcmark(); // check if we moved since setting pcmark checkpcmark(); // check if we moved since setting pcmark
@@ -1496,9 +1499,9 @@ prep_redo_num2(
} }
/* /*
* check for operator active and clear it * Check for operator active and clear it.
* *
* return TRUE if operator was active * Beep and return TRUE if an operator was active.
*/ */
static int static int
checkclearop(oparg_T *oap) checkclearop(oparg_T *oap)
@@ -1512,7 +1515,7 @@ checkclearop(oparg_T *oap)
/* /*
* Check for operator or Visual active. Clear active operator. * Check for operator or Visual active. Clear active operator.
* *
* Return TRUE if operator or Visual was active. * Beep and return TRUE if an operator or Visual was active.
*/ */
static int static int
checkclearopq(oparg_T *oap) checkclearopq(oparg_T *oap)

4
src/testdir/test_autocmd.vim
View File

@@ -3672,7 +3672,7 @@ endfunc
" Test for ModeChanged pattern " Test for ModeChanged pattern
func Test_mode_changes() func Test_mode_changes()
let g:index = 0 let g:index = 0
let g:mode_seq = ['n', 'i', 'n', 'v', 'V', 'i', 'ix', 'i', 'ic', 'i', 'n', 'no', 'n', 'V', 'v', 's', 'n'] let g:mode_seq = ['n', 'i', 'n', 'v', 'V', 'i', 'ix', 'i', 'ic', 'i', 'n', 'no', 'noV', 'n', 'V', 'v', 's', 'n']
func! TestMode() func! TestMode()
call assert_equal(g:mode_seq[g:index], get(v:event, "old_mode")) call assert_equal(g:mode_seq[g:index], get(v:event, "old_mode"))
call assert_equal(g:mode_seq[g:index + 1], get(v:event, "new_mode")) call assert_equal(g:mode_seq[g:index + 1], get(v:event, "new_mode"))
@@ -3683,7 +3683,7 @@ func Test_mode_changes()
au ModeChanged * :call TestMode() au ModeChanged * :call TestMode()
let g:n_to_any = 0 let g:n_to_any = 0
au ModeChanged n:* let g:n_to_any += 1 au ModeChanged n:* let g:n_to_any += 1
call feedkeys("i\<esc>vVca\<CR>\<C-X>\<C-L>\<esc>ggdG", 'tnix') call feedkeys("i\<esc>vVca\<CR>\<C-X>\<C-L>\<esc>ggdV\<MouseMove>G", 'tnix')
let g:V_to_v = 0 let g:V_to_v = 0
au ModeChanged V:v let g:V_to_v += 1 au ModeChanged V:v let g:V_to_v += 1

2
src/version.c
View File

@@ -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 */
/**/
1490,
/**/ /**/
1489, 1489,
/**/ /**/