From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 11 Dec 2013 12:21:51 +0000 (+0100)
Subject: updated for version 7.4.115
X-Git-Tag: v7.4.115
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b011af969652f6be0775ba8dcd54aac4dcb57cdb;p=vim

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 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
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    115,
 /**/
     114,
 /**/