Mercurial > vim
changeset 32224:e33c3437796a v9.0.1443
patch 9.0.1443: ending Insert mode when accessing a hidden prompt buffer
Commit: https://github.com/vim/vim/commit/05a627c3d4e42a18f76c14828d68ee4747118211
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Apr 9 22:01:31 2023 +0100
patch 9.0.1443: ending Insert mode when accessing a hidden prompt buffer
Problem: Ending Insert mode when accessing a hidden prompt buffer.
Solution: Don't stop Insert mode when it was active before. (closes https://github.com/vim/vim/issues/12237)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 09 Apr 2023 23:15:05 +0200 |
| parents | b7a5c9aea5ac |
| children | 07e248d5b72b |
| files | src/autocmd.c src/structs.h src/testdir/test_prompt_buffer.vim src/version.c |
| diffstat | 4 files changed, 19 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/autocmd.c +++ b/src/autocmd.c @@ -1566,6 +1566,8 @@ aucmd_prepbuf( aco->save_curwin_id = curwin->w_id; aco->save_curbuf = curbuf; aco->save_prevwin_id = prevwin == NULL ? 0 : prevwin->w_id; + aco->save_State = State; + if (win != NULL) { // There is a window for "buf" in the current tab page, make it the @@ -1660,6 +1662,9 @@ win_found: #ifdef FEAT_JOB_CHANNEL // May need to stop Insert mode if we were in a prompt buffer. leaving_window(curwin); + // Do not stop Insert mode when already in Insert mode before. + if (aco->save_State & MODE_INSERT) + stop_insert_mode = FALSE; #endif // Remove the window and frame from the tree of frames. (void)winframe_remove(curwin, &dummy, NULL);
--- a/src/structs.h +++ b/src/structs.h @@ -4274,6 +4274,7 @@ typedef struct bufref_T new_curbuf; // new curbuf char_u *globaldir; // saved value of globaldir int save_VIsual_active; // saved VIsual_active + int save_State; // saved State } aco_save_T; /*
--- a/src/testdir/test_prompt_buffer.vim +++ b/src/testdir/test_prompt_buffer.vim @@ -270,6 +270,7 @@ func Test_prompt_appending_while_hidden( func DoAppend() call appendbufline('prompt', '$', 'Test') + return '' endfunc END call writefile(script, 'XpromptBuffer', 'D') @@ -282,11 +283,21 @@ func Test_prompt_appending_while_hidden( call term_sendkeys(buf, "exit\<CR>") call TermWait(buf) + call assert_notmatch('-- INSERT --', term_getline(buf, 10)) call term_sendkeys(buf, ":call DoAppend()\<CR>") call TermWait(buf) call assert_notmatch('-- INSERT --', term_getline(buf, 10)) + call term_sendkeys(buf, "i") + call TermWait(buf) + call assert_match('-- INSERT --', term_getline(buf, 10)) + + call term_sendkeys(buf, "\<C-R>=DoAppend()\<CR>") + call TermWait(buf) + call assert_match('-- INSERT --', term_getline(buf, 10)) + + call term_sendkeys(buf, "\<Esc>") call StopVimInTerminal(buf) endfunc