Mercurial > vim
changeset 20097:165ec447ca77 v8.2.0604
patch 8.2.0604: :startinsert in a terminal window used later
Commit: https://github.com/vim/vim/commit/eb58a2465825c258beafae96240824923f73779f
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Apr 19 18:13:19 2020 +0200
patch 8.2.0604: :startinsert in a terminal window used later
Problem: :startinsert in a terminal window used later.
Solution: Ignore :startinsert in a terminal window. (closes https://github.com/vim/vim/issues/5952)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 19 Apr 2020 18:15:04 +0200 |
| parents | f68ea7ef5ab2 |
| children | a901238a18a2 |
| files | src/ex_docmd.c src/testdir/test_terminal.vim src/version.c |
| diffstat | 3 files changed, 29 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -7750,6 +7750,11 @@ ex_startinsert(exarg_T *eap) curwin->w_cursor.lnum = 1; set_cursor_for_append_to_line(); } +#ifdef FEAT_TERMINAL + // Ignore this when running in an active terminal. + if (term_job_running(curbuf->b_term)) + return; +#endif // Ignore the command when already in Insert mode. Inserting an // expression register that invokes a function can do this.
--- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -2612,4 +2612,26 @@ func Test_term_nasty_callback() set hidden& endfunc +func Test_term_and_startinsert() + CheckRunVimInTerminal + CheckUnix + + let lines =<< trim EOL + put='some text' + term + startinsert + EOL + call writefile(lines, 'XTest_startinsert') + let buf = RunVimInTerminal('-S XTest_startinsert', {}) + + call term_sendkeys(buf, "exit\r") + call WaitForAssert({-> assert_equal("some text", term_getline(buf, 1))}) + call term_sendkeys(buf, "0l") + call term_sendkeys(buf, "A<\<Esc>") + call WaitForAssert({-> assert_equal("some text<", term_getline(buf, 1))}) + + call StopVimInTerminal(buf) + call delete('XTest_startinsert') +endfunc + " vim: shiftwidth=2 sts=2 expandtab