Mercurial > vim
changeset 19489:31ac050a29a7 v8.2.0302
patch 8.2.0302: setting 'term' may cause error in TermChanged autocommand
Commit: https://github.com/vim/vim/commit/0c81d1b11278b2d962aa6fbb4aa974dab97be59d
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Feb 22 22:45:55 2020 +0100
patch 8.2.0302: setting 'term' may cause error in TermChanged autocommand
Problem: Setting 'term' may cause error in TermChanged autocommand.
Solution: Use aucmd_prepbuf() to switch to the buffer where the autocommand
is to be executed. (closes #5682)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 22 Feb 2020 23:00:05 +0100 |
parents | 3e8ff1d2fe6c |
children | ac68906da0ae |
files | src/term.c src/testdir/test_autocmd.vim src/version.c |
diffstat | 3 files changed, 30 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/term.c +++ b/src/term.c @@ -2071,21 +2071,24 @@ set_termname(char_u *term) check_map_keycodes(); // check mappings for terminal codes used { - bufref_T old_curbuf; + buf_T *buf; + aco_save_T aco; /* * Execute the TermChanged autocommands for each buffer that is * loaded. */ - set_bufref(&old_curbuf, curbuf); - FOR_ALL_BUFFERS(curbuf) + FOR_ALL_BUFFERS(buf) { if (curbuf->b_ml.ml_mfp != NULL) + { + aucmd_prepbuf(&aco, buf); apply_autocmds(EVENT_TERMCHANGED, NULL, NULL, FALSE, curbuf); + // restore curwin/curbuf and a few other things + aucmd_restbuf(&aco); + } } - if (bufref_valid(&old_curbuf)) - curbuf = old_curbuf.br_buf; } }
--- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -2382,4 +2382,24 @@ func Test_FileChangedRO_winclose() augroup! FileChangedROTest endfunc +func LogACmd() + call add(g:logged, line('$')) +endfunc + +func Test_TermChanged() + enew! + tabnew + call setline(1, ['a', 'b', 'c', 'd']) + $ + au TermChanged * call LogACmd() + let g:logged = [] + let term_save = &term + set term=xterm + call assert_equal([1, 4], g:logged) + + au! TermChanged + let &term = term_save + bwipe! +endfunc + " vim: shiftwidth=2 sts=2 expandtab