diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2014-09-19 18:03:17 -0400 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2014-09-19 18:03:17 -0400 |
commit | dc6db20febf1ce1848e87f8950c48a78aaffd8f6 (patch) | |
tree | ae24c551f957f01c109a5138ea047e9db980a412 /src | |
parent | a85f7d35d805f05b6b432d167c129448ffc83fa4 (diff) | |
parent | 102af4f82303e1bada777769df0c88c5637c9129 (diff) | |
download | rneovim-dc6db20febf1ce1848e87f8950c48a78aaffd8f6.tar.gz rneovim-dc6db20febf1ce1848e87f8950c48a78aaffd8f6.tar.bz2 rneovim-dc6db20febf1ce1848e87f8950c48a78aaffd8f6.zip |
Merge pull request #1194 from Shougo/vim-patch-7.4.410
vim-patch:7.4.410
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/ex_getln.c | 5 | ||||
-rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 810df627c1..b8d8837092 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -5200,9 +5200,14 @@ static int ex_window(void) RedrawingDisabled = i; + int save_KeyTyped = KeyTyped; + /* Trigger CmdwinLeave autocommands. */ apply_autocmds(EVENT_CMDWINLEAVE, typestr, typestr, FALSE, curbuf); + /* Restore KeyTyped in case it is modified by autocommands */ + KeyTyped = save_KeyTyped; + /* Restore the command line info. */ ccline = save_ccline; cmdwin_type = 0; diff --git a/src/nvim/version.c b/src/nvim/version.c index 9c9c917052..9013542d3d 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -185,7 +185,7 @@ static char *(features[]) = { static int included_patches[] = { // Add new patch number below this line - //410, + 410, //409 NA //408, //407, |