aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorckelsel <ckelsel@hotmail.com>2017-09-27 20:06:35 +0800
committerckelsel <ckelsel@hotmail.com>2017-09-27 20:07:09 +0800
commit65c97961ecdcfa89bb0ce9ff88f1e84e4d926f21 (patch)
tree3d966874cefa594f0d707173c89424ced846ee27
parent36f13ceb0ab384f0cad9813ae02792a1cf13021a (diff)
downloadrneovim-65c97961ecdcfa89bb0ce9ff88f1e84e4d926f21.tar.gz
rneovim-65c97961ecdcfa89bb0ce9ff88f1e84e4d926f21.tar.bz2
rneovim-65c97961ecdcfa89bb0ce9ff88f1e84e4d926f21.zip
vim-patch:8.0.0132
Problem: Test fails because of using :finish. Solution: Change to return. https://github.com/vim/vim/commit/4c8980b717f73042f1d625ee255fa74eddb989ba
-rw-r--r--src/nvim/testdir/test_syntax.vim2
-rw-r--r--src/nvim/version.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/testdir/test_syntax.vim b/src/nvim/testdir/test_syntax.vim
index 584b6f024a..73594f0f55 100644
--- a/src/nvim/testdir/test_syntax.vim
+++ b/src/nvim/testdir/test_syntax.vim
@@ -79,7 +79,7 @@ endfunc
func Test_syntime()
if !has('profile')
- finish
+ return
endif
syntax on
diff --git a/src/nvim/version.c b/src/nvim/version.c
index bf53f16e8d..6b57185b50 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -971,7 +971,7 @@ static const int included_patches[] = {
135,
134,
133,
- // 132,
+ 132,
131,
// 130 NA
// 129 NA