# HG changeset patch # User Bram Moolenaar # Date 1408289047 -7200 # Node ID 2fd550c75256cc1ecf06a4afc6a856b305cf7a8a # Parent 5e31d6cbc6ca1e1c0a164e7420cabe4731aefbc0 updated for version 7.4.410 Problem: Fold does not open after search when there is a CmdwinLeave autocommand. Solution: Restore KeyTyped. (Jacob Niehus) diff --git a/src/ex_getln.c b/src/ex_getln.c --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -6363,6 +6363,9 @@ ex_window() #ifdef FEAT_RIGHTLEFT int save_cmdmsg_rl = cmdmsg_rl; #endif +#ifdef FEAT_FOLDING + int save_KeyTyped; +#endif /* Can't do this recursively. Can't do it when typing a password. */ if (cmdwin_type != 0 @@ -6497,8 +6500,19 @@ ex_window() RedrawingDisabled = i; # ifdef FEAT_AUTOCMD + +# ifdef FEAT_FOLDING + save_KeyTyped = KeyTyped; +# endif + /* Trigger CmdwinLeave autocommands. */ apply_autocmds(EVENT_CMDWINLEAVE, typestr, typestr, FALSE, curbuf); + +# ifdef FEAT_FOLDING + /* Restore KeyTyped in case it is modified by autocommands */ + KeyTyped = save_KeyTyped; +# endif + # endif /* Restore the command line info. */ diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 410, +/**/ 409, /**/ 408,