# HG changeset patch # User Bram Moolenaar # Date 1426972721 -3600 # Node ID f26c1d294156c092290595897694627867809199 # Parent 6f67adb8ade6f70c8d58bea8752c98eaafe114b6 updated for version 7.4.674 Problem: Missing changes in one file. Solution: Also change the win32 file. diff --git a/src/os_win32.c b/src/os_win32.c --- a/src/os_win32.c +++ b/src/os_win32.c @@ -3378,10 +3378,11 @@ mch_writable(char_u *name) /* * Return 1 if "name" can be executed, 0 if not. + * If "use_path" is FALSE only check if "name" is executable. * Return -1 if unknown. */ int -mch_can_exe(char_u *name, char_u **path) +mch_can_exe(char_u *name, char_u **path, int use_path) { char_u buf[_MAX_PATH]; int len = (int)STRLEN(name); @@ -3389,6 +3390,11 @@ mch_can_exe(char_u *name, char_u **path) if (len >= _MAX_PATH) /* safety check */ return FALSE; + if (!use_path) + { + /* TODO: check if file is really executable. */ + return mch_getperm(name) != -1 && !mch_isdir(name); + } /* If there already is an extension try using the name directly. Also do * this with a Unix-shell like 'shell'. */ diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 674, +/**/ 673, /**/ 672,