diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-03-21 22:18:41 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-03-21 22:18:41 +0100 |
| commit | 77b7710d4e0ec9c1f3d0d057d9fa335420273b37 (patch) | |
| tree | 7f270584c48b72aba4c7eaa11390036096583ccd /src | |
| parent | e7154eb5c391aa39d5a87b47b9f7338f1a65354e (diff) | |
updated for version 7.4.674v7.4.674
Problem: Missing changes in one file.
Solution: Also change the win32 file.
Diffstat (limited to 'src')
| -rw-r--r-- | src/os_win32.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index ac25d7451e..f4d43442d8 100644 --- 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 index 63577aca0a..f86a9552f5 100644 --- 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, |