Mercurial > vim
changeset 27712:9c96612730a0 v8.2.4382
patch 8.2.4382: a custom 'tabline' may cause Esc to work like Enter
Commit: https://github.com/vim/vim/commit/e4835bf34001471a102528659af009bc46361141
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Feb 14 19:17:53 2022 +0000
patch 8.2.4382: a custom 'tabline' may cause Esc to work like Enter
Problem: A custom 'tabline' may cause Esc to work like Enter on the
command line when the popup menu is displayed.
Solution: Save and restore KeyTyped. (closes #9776)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 14 Feb 2022 20:30:02 +0100 |
parents | 6fdafb9cb90e |
children | 40bf82852134 |
files | src/drawscreen.c src/screen.c src/testdir/dumps/Test_wildmenu_pum_40.dump src/testdir/test_cmdline.vim src/version.c |
diffstat | 5 files changed, 31 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/drawscreen.c +++ b/src/drawscreen.c @@ -571,7 +571,6 @@ redraw_custom_statusline(win_T *wp) { static int entered = FALSE; int saved_did_emsg = did_emsg; - int saved_KeyTyped = KeyTyped; // When called recursively return. This can happen when the statusline // contains an expression that triggers a redraw. @@ -592,9 +591,6 @@ redraw_custom_statusline(win_T *wp) } did_emsg |= saved_did_emsg; entered = FALSE; - - // A user function may reset KeyTyped, restore it. - KeyTyped = saved_KeyTyped; } #endif
--- a/src/screen.c +++ b/src/screen.c @@ -1235,6 +1235,7 @@ win_redr_custom( int use_sandbox = FALSE; win_T *ewp; int p_crb_save; + int save_KeyTyped = KeyTyped; // There is a tiny chance that this gets called recursively: When // redrawing a status line triggers redrawing the ruler or tabline. @@ -1394,6 +1395,9 @@ win_redr_custom( theend: entered = FALSE; + + // A user function may reset KeyTyped, restore it. + KeyTyped = save_KeyTyped; } #endif // FEAT_STL_OPT
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_wildmenu_pum_40.dump @@ -0,0 +1,10 @@ +|m+1&#ffffff0|y| |t|a|b| |l|i|n|e| @63 +> +0&&@74 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|b+3#0000000&|a|r| @71 +| +0&&@74
--- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -2107,6 +2107,15 @@ func Test_wildmenu_pum() set statusline=%!MyStatusLine() set laststatus=2 endfunc + + func MyTabLine() + return 'my tab line' + endfunc + func SetupTabline() + set statusline= + set tabline=%!MyTabLine() + set showtabline=2 + endfunc [CODE] call writefile(commands, 'Xtest') @@ -2298,6 +2307,12 @@ func Test_wildmenu_pum() call term_sendkeys(buf, "\<Esc>") call VerifyScreenDump(buf, 'Test_wildmenu_pum_39', {}) + " Esc still works to abort the command when 'tabline' is set + call term_sendkeys(buf, ":call SetupTabline()\<CR>") + call term_sendkeys(buf, ":si\<Tab>") + call term_sendkeys(buf, "\<Esc>") + call VerifyScreenDump(buf, 'Test_wildmenu_pum_40', {}) + call term_sendkeys(buf, "\<C-U>\<CR>") call StopVimInTerminal(buf) call delete('Xtest')