aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.2.4391: command line executed when typing Esc in the GUI

Browse Source 
Problem:    Command line executed when typing Esc in the GUI.
Solution:   Move saving/restoring KeyTyped to build_stl_str_hl().
            (closes #9783)
This commit is contained in:
Bram Moolenaar
2022-02-15 16:17:44 +00:00
parent e88c6b7a5d
commit 0e1f36fc59
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/buffer.c
View File

@@ -4164,6 +4164,7 @@ build_stl_str_hl(
stl_hlrec_T *sp; stl_hlrec_T *sp;
int save_must_redraw = must_redraw; int save_must_redraw = must_redraw;
int save_redr_type = curwin->w_redr_type; int save_redr_type = curwin->w_redr_type;
int save_KeyTyped = KeyTyped;
if (stl_items == NULL) if (stl_items == NULL)
{ {
@@ -5060,6 +5061,9 @@ build_stl_str_hl(
curwin->w_redr_type = save_redr_type; curwin->w_redr_type = save_redr_type;
} }
// A user function may reset KeyTyped, restore it.
KeyTyped = save_KeyTyped;
return width; return width;
} }
#endif // FEAT_STL_OPT #endif // FEAT_STL_OPT

4
src/screen.c
View File

@@ -1235,7 +1235,6 @@ win_redr_custom(
int use_sandbox = FALSE; int use_sandbox = FALSE;
win_T *ewp; win_T *ewp;
int p_crb_save; int p_crb_save;
int save_KeyTyped = KeyTyped;
// There is a tiny chance that this gets called recursively: When // There is a tiny chance that this gets called recursively: When
// redrawing a status line triggers redrawing the ruler or tabline. // redrawing a status line triggers redrawing the ruler or tabline.
@@ -1395,9 +1394,6 @@ win_redr_custom(
theend: theend:
entered = FALSE; entered = FALSE;
// A user function may reset KeyTyped, restore it.
KeyTyped = save_KeyTyped;
} }
#endif // FEAT_STL_OPT #endif // FEAT_STL_OPT

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
4391,
/**/ /**/
4390, 4390,
/**/ /**/