From 11a57dfd16a47f248fe949344bd5db3f12b9bd32 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 11 Apr 2022 19:38:56 +0100 Subject: patch 8.2.4738: Esc on commandline executes command instead of abandoning it Problem: Esc on commandline executes command instead of abandoning it. Solution: Save and restore KeyTyped when removing the popup menu. (closes #10154) --- src/cmdexpand.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/cmdexpand.c') diff --git a/src/cmdexpand.c b/src/cmdexpand.c index 9bcea7e8d6..87953375d5 100644 --- a/src/cmdexpand.c +++ b/src/cmdexpand.c @@ -378,6 +378,7 @@ int cmdline_pum_active(void) void cmdline_pum_remove(void) { int save_p_lz = p_lz; + int save_KeyTyped = KeyTyped; pum_undisplay(); VIM_CLEAR(compl_match_array); @@ -385,6 +386,10 @@ void cmdline_pum_remove(void) update_screen(0); p_lz = save_p_lz; redrawcmd(); + + // When a function is called (e.g. for 'foldtext') KeyTyped might be reset + // as a side effect. + KeyTyped = save_KeyTyped; } void cmdline_pum_cleanup(cmdline_info_T *cclp) -- cgit v1.2.3