Patch 8.2.4391

[Bram Moolenaar]

Patch 8.2.4391
Problem: Command line executed when typing Esc in the GUI.
Solution: Move saving/restoring KeyTyped to build_stl_str_hl().
(closes #9783)
Files: src/buffer.c, src/screen.c


*** ../vim-8.2.4390/src/buffer.c 2022-02-08 15:05:16.660625573 +0000
--- src/buffer.c 2022-02-15 16:13:49.456587691 +0000
***************
*** 4164,4169 ****
--- 4164,4170 ----
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,5065 ****
--- 5061,5069 ----
curwin->w_redr_type = save_redr_type;
}

+ // A user function may reset KeyTyped, restore it.
+ KeyTyped = save_KeyTyped;
+
return width;
}
#endif // FEAT_STL_OPT
*** ../vim-8.2.4390/src/screen.c 2022-02-14 19:17:25.220143635 +0000
--- src/screen.c 2022-02-15 16:13:59.376573504 +0000
***************
*** 1235,1241 ****
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.
--- 1235,1240 ----
***************
*** 1395,1403 ****

theend:
entered = FALSE;
-
- // A user function may reset KeyTyped, restore it.
- KeyTyped = save_KeyTyped;
}

#endif // FEAT_STL_OPT
--- 1394,1399 ----
*** ../vim-8.2.4390/src/version.c 2022-02-15 15:37:07.319841654 +0000
--- src/version.c 2022-02-15 16:15:15.512463974 +0000
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 4391,
/**/

--
hundred-and-one symptoms of being an internet addict:
44. Your friends no longer send you e-mail...they just log on to your IRC
channel.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///