aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorwatiko <service@mail.watiko.net>2016-02-17 04:40:32 +0900
committerwatiko <service@mail.watiko.net>2016-03-06 00:32:39 +0900
commit755d4e82b104a950dc757deac572745d058e0a05 (patch)
tree2363b3de3952e3e3fc819485efb83b47281b662d /src
parent2ac9a3905c30ac957355912db29018352b500f5d (diff)
downloadrneovim-755d4e82b104a950dc757deac572745d058e0a05.tar.gz
rneovim-755d4e82b104a950dc757deac572745d058e0a05.tar.bz2
rneovim-755d4e82b104a950dc757deac572745d058e0a05.zip
vim-patch:7.4.942
Problem: test_tagcase breaks for small builds. Solution: Bail out of the test early. (Hirohito Higashi) https://github.com/vim/vim/commit/60422e68a3a555144f8c76c666f050e8d104c16b
Diffstat (limited to 'src')
-rw-r--r--src/nvim/testdir/test_tagcase.in1
-rw-r--r--src/nvim/version.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/testdir/test_tagcase.in b/src/nvim/testdir/test_tagcase.in
index 322d7696af..6e68111925 100644
--- a/src/nvim/testdir/test_tagcase.in
+++ b/src/nvim/testdir/test_tagcase.in
@@ -1,6 +1,7 @@
Tests for 'tagcase' option
STARTTEST
+:so small.vim
:/^start text$/+1,/^end text$/w! Xtext
:/^start tags$/+1,/^end tags$/-1w! Xtags
:set tags=Xtags
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 0f78d365ca..87bdb409bb 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -348,7 +348,7 @@ static int included_patches[] = {
945,
944,
// 943 NA
- // 942,
+ 942,
941,
// 940 NA
939,