Mercurial > vim
changeset 8078:7676818d486b v7.4.1333
commit https://github.com/vim/vim/commit/f8df7addc5f741c16fa2a458f8777ac1fdf2e01e
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Feb 16 14:07:40 2016 +0100
patch 7.4.1333
Problem: Channel test fails on non-darwin builds.
Solution: Add the "osx" feature and test for that. (Kazunobu Kuriyama)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 16 Feb 2016 14:15:05 +0100 |
| parents | 59a21b97d8f6 |
| children | 6dac7e594219 |
| files | runtime/doc/eval.txt src/eval.c src/testdir/test_channel.vim src/version.c |
| diffstat | 4 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -7275,7 +7275,8 @@ listcmds Compiled with commands for the 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|
--- 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",
--- 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)