aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShougo Matsushita <Shougo.Matsu@gmail.com>2014-09-18 20:29:52 +0900
committerShougo Matsushita <Shougo.Matsu@gmail.com>2014-09-19 19:53:02 +0900
commit102af4f82303e1bada777769df0c88c5637c9129 (patch)
tree6078942e9732ab0036c03f17d2b985570717c940 /src
parent53d15c2c25199f8e44e9a8a74898f06a85e7c83b (diff)
downloadrneovim-102af4f82303e1bada777769df0c88c5637c9129.tar.gz
rneovim-102af4f82303e1bada777769df0c88c5637c9129.tar.bz2
rneovim-102af4f82303e1bada777769df0c88c5637c9129.zip
vim-patch:7.4.410
Problem: Fold does not open after search when there is a CmdwinLeave autocommand. Solution: Restore KeyTyped. (Jacob Niehus) https://code.google.com/p/vim/source/detail?r=v7-4-410
Diffstat (limited to 'src')
-rw-r--r--src/nvim/ex_getln.c5
-rw-r--r--src/nvim/version.c2
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 e80c1f81a1..16afc816f8 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,