Mercurial > vim
changeset 13835:8e583c52eb44 v8.0.1789
patch 8.0.1789: BufWinEnter does not work well for a terminal window
commit https://github.com/vim/vim/commit/606cb8b08ed510962fcdc8ef1abcc1fe35fbffef
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu May 3 20:40:20 2018 +0200
patch 8.0.1789: BufWinEnter does not work well for a terminal window
Problem: BufWinEnter does not work well for a terminal window.
Solution: Do not trigger BufWinEnter when opening a terminal window.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 03 May 2018 20:45:04 +0200 |
| parents | cdf8997299f7 |
| children | f092c30cb749 |
| files | runtime/doc/autocmd.txt src/terminal.c src/testdir/test_terminal.vim src/version.c |
| diffstat | 4 files changed, 8 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -469,6 +469,9 @@ BufWinEnter After a buffer is displaye existing buffer. But it does happen for a ":split" with the name of the current buffer, since it reloads that buffer. + Does not happen for a terminal window, because + it starts in Terminal-Job mode and Normal mode + commands won't work. Use |TerminalOpen| instead. *BufWinLeave* BufWinLeave Before a buffer is removed from a window. Not when it's still visible in another window.
--- a/src/terminal.c +++ b/src/terminal.c @@ -605,13 +605,7 @@ term_start( * a deadlock if the job is waiting for Vim to read. */ channel_set_nonblock(term->tl_job->jv_channel, PART_IN); - if (old_curbuf == NULL) - { - ++curbuf->b_locked; - apply_autocmds(EVENT_BUFWINENTER, NULL, NULL, FALSE, curbuf); - --curbuf->b_locked; - } - else + if (old_curbuf != NULL) { --curbuf->b_nwindows; curbuf = old_curbuf;
--- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -32,7 +32,7 @@ func Run_shell_in_terminal(options) endfunc func Test_terminal_basic() - au BufWinEnter * if &buftype == 'terminal' | let b:done = 'yes' | endif + au TerminalOpen * let b:done = 'yes' let buf = Run_shell_in_terminal({}) if has("unix") @@ -61,7 +61,7 @@ func Test_terminal_basic() close call assert_equal("", bufname(buf)) - au! BufWinEnter + au! TerminalOpen unlet g:job endfunc