summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/channel.c5
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/channel.c b/src/channel.c
index 02ed3a8fc7..0ca6e54954 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -4917,7 +4917,10 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported, int supported2)
break;
opt->jo_cwd = get_tv_string_buf_chk(item, opt->jo_cwd_buf);
if (opt->jo_cwd == NULL || !mch_isdir(opt->jo_cwd)
- || mch_access((char *)opt->jo_cwd, X_OK) != 0)
+#ifndef WIN32 // Win32 directories don't have the concept of "executable"
+ || mch_access((char *)opt->jo_cwd, X_OK) != 0
+#endif
+ )
{
EMSG2(_(e_invargval), "cwd");
return FAIL;
diff --git a/src/version.c b/src/version.c
index 4ed8adc265..726f5eeae2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 486,
+/**/
485,
/**/
484,