aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/version.c
diff options
context:
space:
mode:
authorShougo Matsushita <Shougo.Matsu@gmail.com>2016-11-22 06:52:51 +0900
committerJustin M. Keyes <justinkz@gmail.com>2016-12-09 17:46:14 +0100
commit7da7ff7c5c79dd36e053f5b5e86046838445bb8e (patch)
tree05a4a04e2e3878dbc1cd60897a42f7457de939c0 /src/nvim/version.c
parent880ce887ed1a7b7fcdbccbd59d45eb6b5537c67d (diff)
downloadrneovim-7da7ff7c5c79dd36e053f5b5e86046838445bb8e.tar.gz
rneovim-7da7ff7c5c79dd36e053f5b5e86046838445bb8e.tar.bz2
rneovim-7da7ff7c5c79dd36e053f5b5e86046838445bb8e.zip
vim-patch:7.4.1758, 7.4.1759, 7.4.1692 #5640
vim-patch:7.4.1758 Problem: Triggering CursorHoldI when in CTRL-X mode causes problems. Solution: Do not trigger CursorHoldI in CTRL-X mode. Add "!" flag to feedkeys() (test with that didn't work though). https://github.com/vim/vim/commit/245c41070c7f37d52be43cce0cb140bd3ade6c7e vim-patch:7.4.1759 Problem: When using feedkeys() in a timer the inserted characters are not used right away. Solution: Break the wait loop when characters have been added to typebuf. use this for testing CursorHoldI. https://github.com/vim/vim/commit/40b1b5443c88fab77f1f7c6f9e801f7ffdb7e0a8 vim-patch:7.4.1692 Problem: feedkeys('i', 'x') gets stuck, waits for a character to be typed. Solution: Behave like ":normal". (Yasuhiro Matsumoto)
Diffstat (limited to 'src/nvim/version.c')
-rw-r--r--src/nvim/version.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index f78ae00dad..c48b26c9ce 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -684,8 +684,8 @@ static int included_patches[] = {
// 1762,
// 1761,
// 1760 NA
- // 1759,
- // 1758,
+ 1759,
+ 1758,
1757,
// 1756 NA
1755,
@@ -752,7 +752,7 @@ static int included_patches[] = {
1695,
// 1694 NA
// 1693 NA
- // 1692,
+ 1692,
1691,
// 1690 NA
// 1689 NA