diff options
-rw-r--r-- | src/buffer.c | 7 | ||||
-rw-r--r-- | src/testdir/test_autocmd.vim | 21 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 30 insertions, 0 deletions
diff --git a/src/buffer.c b/src/buffer.c index b292150a2..c7f361af0 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -291,6 +291,13 @@ open_buffer( unchanged(curbuf, FALSE); save_file_ff(curbuf); /* keep this fileformat */ + /* Set last_changedtick to avoid triggering a TextChanged autocommand right + * after it was added. */ + curbuf->b_last_changedtick = CHANGEDTICK(curbuf); +#ifdef FEAT_INS_EXPAND + curbuf->b_last_changedtick_pum = CHANGEDTICK(curbuf); +#endif + /* require "!" to overwrite the file, because it wasn't read completely */ #ifdef FEAT_EVAL if (aborting()) diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim index d1ce56197..af7aaff74 100644 --- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -1,5 +1,7 @@ " Tests for autocommands +source shared.vim + func! s:cleanup_buffers() abort for bnr in range(1, bufnr('$')) if bufloaded(bnr) && bufnr('%') != bnr @@ -1304,3 +1306,22 @@ func Test_ChangedP() bw! endfunc + +func Test_Changed_FirstTime() + if !has('terminal') || has('gui_running') + return + endif + " Prepare file for TextChanged event. + call writefile([''], 'Xchanged.txt') + let buf = term_start([GetVimProg(), '--clean', '-c', 'set noswapfile'], {'term_rows': 3}) + call assert_equal('running', term_getstatus(buf)) + " It's only adding autocmd, so that no event occurs. + call term_sendkeys(buf, ":au! TextChanged <buffer> call writefile(['No'], 'Xchanged.txt')\<cr>") + call term_sendkeys(buf, "\<C-\\>\<C-N>:qa!\<cr>") + call WaitFor({-> term_getstatus(buf) == 'finished'}) + call assert_equal([''], readfile('Xchanged.txt')) + + " clean up + call delete('Xchanged.txt') + bwipe! +endfunc diff --git a/src/version.c b/src/version.c index 6999611c0..4ae79e7c5 100644 --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1633, +/**/ 1632, /**/ 1631, |