From 0e1f36fc59b589e4755fd9102013971f45222084 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 15 Feb 2022 16:17:44 +0000 Subject: [PATCH] patch 8.2.4391: command line executed when typing Esc in the GUI Problem: Command line executed when typing Esc in the GUI. Solution: Move saving/restoring KeyTyped to build_stl_str_hl(). (closes #9783) --- src/buffer.c | 4 ++++ src/screen.c | 4 ---- src/version.c | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/buffer.c b/src/buffer.c index b3e2bc3f98..bb9c773679 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -4164,6 +4164,7 @@ build_stl_str_hl( stl_hlrec_T *sp; int save_must_redraw = must_redraw; int save_redr_type = curwin->w_redr_type; + int save_KeyTyped = KeyTyped; if (stl_items == NULL) { @@ -5060,6 +5061,9 @@ build_stl_str_hl( curwin->w_redr_type = save_redr_type; } + // A user function may reset KeyTyped, restore it. + KeyTyped = save_KeyTyped; + return width; } #endif // FEAT_STL_OPT diff --git a/src/screen.c b/src/screen.c index 9010090d79..adcc4b5bab 100644 --- a/src/screen.c +++ b/src/screen.c @@ -1235,7 +1235,6 @@ 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. @@ -1395,9 +1394,6 @@ win_redr_custom( theend: entered = FALSE; - - // A user function may reset KeyTyped, restore it. - KeyTyped = save_KeyTyped; } #endif // FEAT_STL_OPT diff --git a/src/version.c b/src/version.c index 8edb112bee..e5bbd10be4 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 4391, /**/ 4390, /**/ -- 2.47.3