aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.0.1443: ending Insert mode when accessing a hidden prompt buffer

Browse Source 
Problem:    Ending Insert mode when accessing a hidden prompt buffer.
Solution:   Don't stop Insert mode when it was active before. (closes #12237)
This commit is contained in:
Bram Moolenaar 2023-04-09 22:01:31 +01:00
parent bfc7cbd1d4
commit 05a627c3d4
4 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/autocmd.c
View File

@ -1566,6 +1566,8 @@ aucmd_prepbuf(
aco->save_curwin_id = curwin->w_id; aco->save_curwin_id = curwin->w_id;
aco->save_curbuf = curbuf; aco->save_curbuf = curbuf;
aco->save_prevwin_id = prevwin == NULL ? 0 : prevwin->w_id; aco->save_prevwin_id = prevwin == NULL ? 0 : prevwin->w_id;
aco->save_State = State;
if (win != NULL) if (win != NULL)
{ {
// There is a window for "buf" in the current tab page, make it the // There is a window for "buf" in the current tab page, make it the
@ -1660,6 +1662,9 @@ win_found:
#ifdef FEAT_JOB_CHANNEL #ifdef FEAT_JOB_CHANNEL
// May need to stop Insert mode if we were in a prompt buffer. // May need to stop Insert mode if we were in a prompt buffer.
leaving_window(curwin); 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 #endif
// Remove the window and frame from the tree of frames. // Remove the window and frame from the tree of frames.
(void)winframe_remove(curwin, &dummy, NULL); (void)winframe_remove(curwin, &dummy, NULL);

1
src/structs.h
View File

@ -4274,6 +4274,7 @@ typedef struct
bufref_T new_curbuf; // new curbuf bufref_T new_curbuf; // new curbuf
char_u *globaldir; // saved value of globaldir char_u *globaldir; // saved value of globaldir
int save_VIsual_active; // saved VIsual_active int save_VIsual_active; // saved VIsual_active
int save_State; // saved State
} aco_save_T; } aco_save_T;
/* /*

11
src/testdir/test_prompt_buffer.vim
View File

@ -270,6 +270,7 @@ func Test_prompt_appending_while_hidden()
func DoAppend() func DoAppend()
call appendbufline('prompt', '$', 'Test') call appendbufline('prompt', '$', 'Test')
return ''
endfunc endfunc
END END
call writefile(script, 'XpromptBuffer', 'D') call writefile(script, 'XpromptBuffer', 'D')
@ -282,11 +283,21 @@ func Test_prompt_appending_while_hidden()
call term_sendkeys(buf, "exit\<CR>") call term_sendkeys(buf, "exit\<CR>")
call TermWait(buf) call TermWait(buf)
call assert_notmatch('-- INSERT --', term_getline(buf, 10))
call term_sendkeys(buf, ":call DoAppend()\<CR>") call term_sendkeys(buf, ":call DoAppend()\<CR>")
call TermWait(buf) call TermWait(buf)
call assert_notmatch('-- INSERT --', term_getline(buf, 10)) 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) call StopVimInTerminal(buf)
endfunc endfunc

2
src/version.c
View File

@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1443,
/**/ /**/
1442, 1442,
/**/ /**/