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)

diff --git a/src/os_unix.c b/src/os_unix.c
index 5eb0936c88e544d8b78894a99bf76c9b4618f390..148d033c31442404c40e9e7a8bf994351ea2b5e8 100644 (file)
--- 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 f7a35520696cb97c5ab5f9d55bd2ee7ff308fa23..a69488f16ed20cee4b732a1027692609afdafa2b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    115,
 /**/
     114,
 /**/