diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-16 14:07:40 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-16 14:07:40 +0100 |
| commit | f8df7addc5f741c16fa2a458f8777ac1fdf2e01e (patch) | |
| tree | 44ba2032c8557fa75e24d03dab73e8bc99fdd967 | |
| parent | acd58ef676bb9559ac0f635f66b62f4602929c87 (diff) | |
| download | vim-git-f8df7addc5f741c16fa2a458f8777ac1fdf2e01e.tar.gz | |
patch 7.4.1333v7.4.1333
Problem: Channel test fails on non-darwin builds.
Solution: Add the "osx" feature and test for that. (Kazunobu Kuriyama)
| -rw-r--r-- | runtime/doc/eval.txt | 3 | ||||
| -rw-r--r-- | src/eval.c | 5 | ||||
| -rw-r--r-- | src/testdir/test_channel.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 5a03fcf29..6feb137a2 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -7275,7 +7275,8 @@ listcmds Compiled with commands for the buffer list |:files| localmap Compiled with local mappings and abbr. |:map-local| lua Compiled with Lua interface |Lua|. mac Macintosh version of Vim. -macunix Macintosh version of Vim, using Unix files (OS-X). +macunix Compiled for OS X, with darwin +osx Compiled for OS X, with or without darwin menu Compiled with support for |:menu|. mksession Compiled with support for |:mksession|. modify_fname Compiled with file name modifiers. |filename-modifiers| diff --git a/src/eval.c b/src/eval.c index ff7f9a7bd..84b7197c8 100644 --- a/src/eval.c +++ b/src/eval.c @@ -13117,7 +13117,10 @@ f_has(typval_T *argvars, typval_T *rettv) "mac", #endif #if defined(MACOS_X_UNIX) - "macunix", + "macunix", /* built with 'darwin' enabled */ +#endif +#if defined(__APPLE__) && __APPLE__ == 1 + "osx", /* built with or without 'darwin' enabled */ #endif #ifdef __QNX__ "qnx", diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index b6c986006..62b5c89b4 100644 --- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -28,7 +28,7 @@ else finish endif -let s:chopt = has('macunix') ? {'waittime' : 1} : {} +let s:chopt = has('osx') ? {'waittime' : 1} : {} " Run "testfunc" after sarting the server and stop the server afterwards. func s:run_server(testfunc) diff --git a/src/version.c b/src/version.c index 4bdf98885..fa362988b 100644 --- a/src/version.c +++ b/src/version.c @@ -748,6 +748,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1333, +/**/ 1332, /**/ 1331, |