0
0
mirror of https://github.com/vim/vim.git synced 2025-09-30 04:44:14 -04:00

patch 8.2.1781: writing to prompt buffer interferes with insert mode

Problem:    Writing to prompt buffer interferes with insert mode.
Solution:   Use win_enter() instead of just setting "curwin". (Ben Jackson,
            closes #7035)
This commit is contained in:
Bram Moolenaar
2020-10-01 20:03:04 +02:00
parent 668008be66
commit 4537bcc889
3 changed files with 36 additions and 1 deletions

View File

@@ -1533,7 +1533,7 @@ win_found:
unblock_autocmds();
if (win_valid(aco->save_curwin))
curwin = aco->save_curwin;
win_enter(aco->save_curwin, TRUE);
else
// Hmm, original window disappeared. Just use the first one.
curwin = firstwin;

View File

@@ -182,4 +182,37 @@ func Test_prompt_buffer_getbufinfo()
%bwipe!
endfunc
function! Test_prompt_while_writing_to_hidden_buffer()
call CanTestPromptBuffer()
CheckUnix
" Make a job continuously write to a hidden buffer, check that the prompt
" buffer is not affected.
let scriptName = 'XpromptscriptHiddenBuf'
let script =<< trim END
set buftype=prompt
call prompt_setprompt( bufnr(), 'cmd:' )
let job = job_start(['/bin/sh', '-c',
\ 'while true;
\ do echo line;
\ sleep 0.1;
\ done'], #{out_io: 'buffer', out_name: ''})
startinsert
END
eval script->writefile(scriptName)
let buf = RunVimInTerminal('-S ' .. scriptName, {})
call WaitForAssert({-> assert_equal('cmd:', term_getline(buf, 1))})
call term_sendkeys(buf, 'test')
call WaitForAssert({-> assert_equal('cmd:test', term_getline(buf, 1))})
call term_sendkeys(buf, 'test')
call WaitForAssert({-> assert_equal('cmd:testtest', term_getline(buf, 1))})
call term_sendkeys(buf, 'test')
call WaitForAssert({-> assert_equal('cmd:testtesttest', term_getline(buf, 1))})
call StopVimInTerminal(buf)
call delete(scriptName)
endfunc
" vim: shiftwidth=2 sts=2 expandtab

View File

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