diff options
| -rw-r--r-- | src/edit.c | 4 | ||||
| -rw-r--r-- | src/testdir/test_autocmd.vim | 23 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 23 insertions, 6 deletions
diff --git a/src/edit.c b/src/edit.c index a515425253..014d1c7ed3 100644 --- a/src/edit.c +++ b/src/edit.c @@ -174,6 +174,9 @@ edit( return FALSE; } ins_compl_clear(); // clear stuff for CTRL-X mode + // Reset Changedtick_i, so that TextChangedI will only be triggered for stuff + // from insert mode + curbuf->b_last_changedtick_i = CHANGEDTICK(curbuf); /* * Trigger InsertEnter autocommands. Do not do this for "r<CR>" or "grx". @@ -840,6 +843,7 @@ doESCkey: if (cmdchar != 'r' && cmdchar != 'v' && c != Ctrl_C) ins_apply_autocmds(EVENT_INSERTLEAVE); did_cursorhold = FALSE; + curbuf->b_last_changedtick = CHANGEDTICK(curbuf); return (c == Ctrl_O); } continue; diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim index 419005aa6e..1e1bb4540a 100644 --- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -2566,27 +2566,28 @@ func Test_ChangedP() call cursor(3, 1) let g:autocmd = '' call feedkeys("o\<esc>", 'tnix') - call assert_equal('I', g:autocmd) + " `TextChangedI` triggers only if text is actually changed in Insert mode + call assert_equal('', g:autocmd) let g:autocmd = '' call feedkeys("Sf", 'tnix') - call assert_equal('II', g:autocmd) + call assert_equal('I', g:autocmd) let g:autocmd = '' call feedkeys("Sf\<C-N>", 'tnix') - call assert_equal('IIP', g:autocmd) + call assert_equal('IP', g:autocmd) let g:autocmd = '' call feedkeys("Sf\<C-N>\<C-N>", 'tnix') - call assert_equal('IIPP', g:autocmd) + call assert_equal('IPP', g:autocmd) let g:autocmd = '' call feedkeys("Sf\<C-N>\<C-N>\<C-N>", 'tnix') - call assert_equal('IIPPP', g:autocmd) + call assert_equal('IPPP', g:autocmd) let g:autocmd = '' call feedkeys("Sf\<C-N>\<C-N>\<C-N>\<C-N>", 'tnix') - call assert_equal('IIPPPP', g:autocmd) + call assert_equal('IPPPP', g:autocmd) call assert_equal(['foo', 'bar', 'foobar', 'foo'], getline(1, '$')) " TODO: how should it handle completeopt=noinsert,noselect? @@ -3610,6 +3611,16 @@ func Test_Changed_ChangedI() " call assert_equal('N4', g:autocmd_n) call assert_equal('I3', g:autocmd_i) + " TextChangedI should only trigger if change was done in Insert mode + let g:autocmd_i = '' + call feedkeys("yypi\<esc>", 'tnix') + call assert_equal('', g:autocmd_i) + + " TextChanged should only trigger if change was done in Normal mode + let g:autocmd_n = '' + call feedkeys("ibar\<esc>", 'tnix') + call assert_equal('', g:autocmd_n) + " CleanUp call test_override("char_avail", 0) au! TextChanged <buffer> diff --git a/src/version.c b/src/version.c index b90f76fc15..4bac9840f3 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2031, +/**/ 2030, /**/ 2029, |