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 5a03fcf29796afb7dfdff63dfe0896fa1bf586e2..6feb137a2f23796f232244a4c5ef000b30d8218f 100644 (file)
--- 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 ff7f9a7bd68b89da15488535a39cce9c9e602fc6..84b7197c80688755b9ad6f9999261ff2550b9d35 100644 (file)
--- 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 b6c986006ffec0e1d30febdb5ef55ae65cade1d0..62b5c89b422938d15c21efec2125b0b5ead33a7c 100644 (file)
--- 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 4bdf98885f844eaf38a2ea342b9ea906092e0d68..fa362988b831a93775d87b3016c366b523818090 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1333,
 /**/
     1332,
 /**/