diff options
author | Bram Moolenaar <Bram@vim.org> | 2013-12-11 13:21:51 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2013-12-11 13:21:51 +0100 |
commit | b011af969652f6be0775ba8dcd54aac4dcb57cdb (patch) | |
tree | 4dffbe1b19b5ff8c05d8d41c896ef8ce250eeb50 /src | |
parent | 5d7f9df8fa12e076c233069bb0a98d490749a63a (diff) | |
download | vim-b011af969652f6be0775ba8dcd54aac4dcb57cdb.zip |
updated for version 7.4.115
Problem: When using Zsh expanding ~abc doesn't work when the result
contains a space.
Solution: Off-by-one error in detecting the NUL. (Pavol Juhas)
Diffstat (limited to 'src')
-rw-r--r-- | src/os_unix.c | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 5eb0936c8..148d033c3 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -5990,7 +5990,7 @@ mch_expand_wildcards(num_pat, pat, num_file, file, flags) { /* If there is a NUL, set did_find_nul, else set check_spaces */ buffer[len] = NUL; - if (len && (int)STRLEN(buffer) < (int)len - 1) + if (len && (int)STRLEN(buffer) < (int)len) did_find_nul = TRUE; else check_spaces = TRUE; diff --git a/src/version.c b/src/version.c index f7a355206..a69488f16 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 115, +/**/ 114, /**/ 113, |