mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -04:00
updated for version 7.4.410
Problem: Fold does not open after search when there is a CmdwinLeave autocommand. Solution: Restore KeyTyped. (Jacob Niehus)
This commit is contained in:
@@ -6363,6 +6363,9 @@ ex_window()
|
|||||||
#ifdef FEAT_RIGHTLEFT
|
#ifdef FEAT_RIGHTLEFT
|
||||||
int save_cmdmsg_rl = cmdmsg_rl;
|
int save_cmdmsg_rl = cmdmsg_rl;
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef FEAT_FOLDING
|
||||||
|
int save_KeyTyped;
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Can't do this recursively. Can't do it when typing a password. */
|
/* Can't do this recursively. Can't do it when typing a password. */
|
||||||
if (cmdwin_type != 0
|
if (cmdwin_type != 0
|
||||||
@@ -6497,8 +6500,19 @@ ex_window()
|
|||||||
RedrawingDisabled = i;
|
RedrawingDisabled = i;
|
||||||
|
|
||||||
# ifdef FEAT_AUTOCMD
|
# ifdef FEAT_AUTOCMD
|
||||||
|
|
||||||
|
# ifdef FEAT_FOLDING
|
||||||
|
save_KeyTyped = KeyTyped;
|
||||||
|
# endif
|
||||||
|
|
||||||
/* Trigger CmdwinLeave autocommands. */
|
/* Trigger CmdwinLeave autocommands. */
|
||||||
apply_autocmds(EVENT_CMDWINLEAVE, typestr, typestr, FALSE, curbuf);
|
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
|
# endif
|
||||||
|
|
||||||
/* Restore the command line info. */
|
/* Restore the command line info. */
|
||||||
|
@@ -741,6 +741,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 */
|
||||||
|
/**/
|
||||||
|
410,
|
||||||
/**/
|
/**/
|
||||||
409,
|
409,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user