IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1582: :stopinsert may not work in a popup close handler (#23785)

Browse Source 
Problem:    :stopinsert may not work in a popup close handler. (Ben Jackson)
Solution:   Restore stop_insert_mode when appropriate. (closes vim/vim#12452,
            closes vim/vim#12434)

a40c0bcc83
This commit is contained in:
zeertzjq 2023-05-27 22:15:22 +08:00 committed by GitHub
parent 510e1f131b
commit b46f61ac05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/autocmd.c
View File

@ -1355,11 +1355,13 @@ void aucmd_restbuf(aco_save_T *aco)
}
}
win_found:
;
const bool save_stop_insert_mode = stop_insert_mode;
// 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;
stop_insert_mode = save_stop_insert_mode;
}
// Remove the window.
win_remove(curwin, NULL);

23
test/old/testdir/test_quickfix.vim
View File

@ -6280,5 +6280,28 @@ func Test_setqflist_cb_arg()
call setqflist([], 'f')
endfunc
" Test that setqflist() should not prevent :stopinsert from working
func Test_setqflist_stopinsert()
new
call setqflist([], 'f')
copen
cclose
func StopInsert()
stopinsert
call setqflist([{'text': 'foo'}])
return ''
endfunc
call setline(1, 'abc')
call cursor(1, 1)
call feedkeys("i\<C-R>=StopInsert()\<CR>$", 'tnix')
call assert_equal('foo', getqflist()[0].text)
call assert_equal([0, 1, 3, 0, v:maxcol], getcurpos())
call assert_equal(['abc'], getline(1, '$'))
delfunc StopInsert
call setqflist([], 'f')
bwipe!
endfunc
" vim: shiftwidth=2 sts=2 expandtab