summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-04-09 14:58:15 +0200
committerBram Moolenaar <Bram@vim.org>2017-04-09 14:58:15 +0200
commitd2381a2cadb9ef359ad5efb916734c635b29bd13 (patch)
tree8478fd3dddeb95fea6c8f2ff0db21e657ac27989
parent1cc482069a3407132aeb43a55d6dc284153e79c7 (diff)
downloadvim-git-d2381a2cadb9ef359ad5efb916734c635b29bd13.tar.gz
patch 8.0.0555: toupper/tolower test fails on OSX without Darwinv8.0.0555
Problem: Toupper/tolower test fails on OSX without Darwin. Solution: Skip that part of the test also for OSX. (Kazunobu Kuriyama)
-rw-r--r--src/testdir/test_normal.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim
index 155ddbfb3..21d6aa988 100644
--- a/src/testdir/test_normal.vim
+++ b/src/testdir/test_normal.vim
@@ -1605,7 +1605,7 @@ fun! Test_normal30_changecase()
" Turkish ASCII turns to multi-byte. On Mac the Turkish locale is available
" but toupper()/tolower() don't do the right thing.
- if !has('mac')
+ if !has('mac') && !has('osx')
try
lang tr_TR.UTF-8
set casemap=
diff --git a/src/version.c b/src/version.c
index 578cfe3bf..7cf764443 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 555,
+/**/
554,
/**/
553,