Mercurial > vim
changeset 21731:48f9bf2c677d v8.2.1415
patch 8.2.1415: closing a popup window with CTRL-C interrupts 'statusline'
Commit: https://github.com/vim/vim/commit/6f8f7337c1211692d508239eb4cbc8a6f67de497
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Aug 10 21:19:23 2020 +0200
patch 8.2.1415: closing a popup window with CTRL-C interrupts 'statusline'
Problem: Closing a popup window with CTRL-C interrupts 'statusline' if it
calls a function.
Solution: Reset got_int while redrawing. (closes #6675)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 10 Aug 2020 21:30:05 +0200 |
| parents | 2c83ca2b2038 |
| children | f0845166f35b |
| files | src/popupwin.c src/testdir/dumps/Test_popupwin_ctrl_c.dump src/testdir/test_popupwin.vim src/version.c |
| diffstat | 4 files changed, 44 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/popupwin.c +++ b/src/popupwin.c @@ -3209,7 +3209,14 @@ popup_do_filter(int c) res = invoke_popup_filter(wp, c); if (must_redraw > was_must_redraw) + { + int save_got_int = got_int; + + // Reset got_int to avoid a function used in the statusline aborts. + got_int = FALSE; redraw_after_callback(FALSE); + got_int |= save_got_int; + } recursive = FALSE; KeyTyped = save_KeyTyped; return res;
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_popupwin_ctrl_c.dump @@ -0,0 +1,10 @@ +> +0&#ffffff0@36||+1&&| +0&&@36 +|~+0#4040ff13&| @35||+1#0000000&|~+0#4040ff13&| @35 +|~| @35||+1#0000000&|~+0#4040ff13&| @35 +|~| @35||+1#0000000&|~+0#4040ff13&| @35 +|~| @35||+1#0000000&|~+0#4040ff13&| @35 +|~| @35||+1#0000000&|~+0#4040ff13&| @35 +|~| @35||+1#0000000&|~+0#4040ff13&| @35 +|~| @35||+1#0000000&|~+0#4040ff13&| @35 +|[+3#0000000&|N|o| |N|a|m|e|]| @9|0|,|0|-|1| @9|A|l@1| |[+1&&|N|o| |N|a|m|e|]| @9|0|,|0|-|1| @9|A|l@1 +| +0&&@74
--- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -3479,6 +3479,31 @@ func Test_popupwin_filter_input_multibyt unlet g:bytes endfunc +func Test_popupwin_filter_close_ctrl_c() + CheckScreendump + + let lines =<< trim END + vsplit + set laststatus=2 + set statusline=%!Statusline() + + function Statusline() abort + return '%<%f %h%m%r%=%-14.(%l,%c%V%) %P' + endfunction + + call popup_create('test test test test...', {'filter': {-> 0}}) + END + call writefile(lines, 'XtestPopupCtrlC') + + let buf = RunVimInTerminal('-S XtestPopupCtrlC', #{rows: 10}) + + call term_sendkeys(buf, "\<C-C>") + call VerifyScreenDump(buf, 'Test_popupwin_ctrl_c', {}) + + call StopVimInTerminal(buf) + call delete('XtestPopupCorners') +endfunc + func Test_popupwin_atcursor_far_right() new