aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/version.c
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2017-04-06 08:56:53 -0400
committerJames McCoy <jamessan@jamessan.com>2017-04-06 08:57:22 -0400
commit9edbeec07716cff5607202dbd20b81917416030f (patch)
tree07cb1235ebedfae5101436676ee2c41625b682ea /src/nvim/version.c
parent0f99645b8faf3e5970e46c185c0cbbd7a9cfe318 (diff)
downloadrneovim-9edbeec07716cff5607202dbd20b81917416030f.tar.gz
rneovim-9edbeec07716cff5607202dbd20b81917416030f.tar.bz2
rneovim-9edbeec07716cff5607202dbd20b81917416030f.zip
vim-patch:7.4.2332
Problem: Crash when stop_timer() is called in a callback of a callback. Vim hangs when the timer callback uses too much time. Solution: Set tr_id to -1 when a timer is to be deleted. Don't keep calling callbacks forever. (Ozaki Kiichi) https://github.com/vim/vim/commit/75537a93e985ef32e6c267b06ce93629855dd983
Diffstat (limited to 'src/nvim/version.c')
-rw-r--r--src/nvim/version.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index beb23090ec..d16eab7201 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -109,7 +109,7 @@ static const int included_patches[] = {
2335,
2334,
2333,
- // 2332 NA
+ 2332,
2331,
2330,
2329,