diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-08-17 17:24:07 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-08-17 17:24:07 +0200 |
| commit | 42f06f9dbc1e167a8ddef2ec500d952870600d5e (patch) | |
| tree | f4bb223b5c45fa0dafd252cdc31f28405e63ce6d | |
| parent | d5f62b14e1d70f23866e613449ca71ac0b903e0f (diff) | |
| download | vim-git-42f06f9dbc1e167a8ddef2ec500d952870600d5e.tar.gz | |
updated for version 7.4.410v7.4.410
Problem: Fold does not open after search when there is a CmdwinLeave
autocommand.
Solution: Restore KeyTyped. (Jacob Niehus)
| -rw-r--r-- | src/ex_getln.c | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index fcc1d600a..6ca707e43 100644 --- 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 index f7084a7cd..7126b8b9e 100644 --- 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, |