summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-21 23:53:06 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-21 23:53:06 +0100
commit09e786e7a7fc952f43e3f88ba49ab1ac6ef3b3a3 (patch)
tree749102898ea3fa9cf7511137ab0b07814bf9b10d
parent13d5aeef56e3140a8eb8f40c7062aa1c5700f76e (diff)
downloadvim-git-09e786e7a7fc952f43e3f88ba49ab1ac6ef3b3a3.tar.gz
patch 7.4.1152v7.4.1152
Problem: Langmap test fails with normal build. Solution: Check for +langmap feature.
-rw-r--r--src/testdir/test_langmap.vim4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/testdir/test_langmap.vim b/src/testdir/test_langmap.vim
index 066c3bf2b..572fad78b 100644
--- a/src/testdir/test_langmap.vim
+++ b/src/testdir/test_langmap.vim
@@ -1,5 +1,9 @@
" tests for 'langmap'
+if !has('langmap')
+ finish
+endif
+
func Test_langmap()
new
set langmap=}l,^x,%v
diff --git a/src/version.c b/src/version.c
index 83540a49c..34cfad4df 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1152,
+/**/
1151,
/**/
1150,