patch 7.4.1333
Problem: Channel test fails on non-darwin builds.
Solution: Add the "osx" feature and test for that. (Kazunobu Kuriyama)
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 5a03fcf..6feb137 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -7275,7 +7275,8 @@
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 ff7f9a7..84b7197 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -13117,7 +13117,10 @@
"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 b6c9860..62b5c89 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -28,7 +28,7 @@
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 4bdf988..fa36298 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1333,
+/**/
1332,
/**/
1331,