aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarco Hinz <mh.codebro@gmail.com>2014-12-20 16:46:09 +0100
committerJustin M. Keyes <justinkz@gmail.com>2014-12-23 03:38:17 -0500
commitc3de63bfbc168cd8ccc53dbb3e587043c11f7276 (patch)
treec7735235a88a0cae47c94763cad8e3f611351dde /src
parentbac6fb41b2754324ec719130271b66ccf4d0ea9e (diff)
downloadrneovim-c3de63bfbc168cd8ccc53dbb3e587043c11f7276.tar.gz
rneovim-c3de63bfbc168cd8ccc53dbb3e587043c11f7276.tar.bz2
rneovim-c3de63bfbc168cd8ccc53dbb3e587043c11f7276.zip
vim-patch:7.4.457 #1713
Problem: Using getchar() in an expression mapping may result in K_CURSORHOLD, which can't be recognized. Solution: Add the <CursorHold> key. (Hirohito Higashi) https://code.google.com/p/vim/source/detail?r=v7-4-457
Diffstat (limited to 'src')
-rw-r--r--src/nvim/keymap.c1
-rw-r--r--src/nvim/version.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/keymap.c b/src/nvim/keymap.c
index 9c5160ffb2..33eaf35555 100644
--- a/src/nvim/keymap.c
+++ b/src/nvim/keymap.c
@@ -281,6 +281,7 @@ static struct key_name_entry {
{K_ZERO, (char_u *)"Nul"},
{K_SNR, (char_u *)"SNR"},
{K_PLUG, (char_u *)"Plug"},
+ {K_CURSORHOLD, (char_u *)"CursorHold"},
{0, NULL}
};
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 54646d6061..cd11dfe1d0 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -280,7 +280,7 @@ static int included_patches[] = {
//460 NA
//459 NA
//458,
- //457,
+ 457,
456,
455,
454,