updated for version 7.1-127

diff --git a/src/ex_getln.c b/src/ex_getln.c
index f417619894e7096cfaecd36a869e66e0df756eae..7ce48a891a08f071b475561cc6672d54d535b3f5 100644 (file)
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -3316,6 +3316,10 @@ nextwild(xp, type, options)
  * Return a pointer to alloced memory containing the new string.
  * Return NULL for failure.
  *
+ * "orig" is the originally expanded string, copied to allocated memory.  It
+ * should either be kept in orig_save or freed.  When "mode" is WILD_NEXT or
+ * WILD_PREV "orig" should be NULL.
+ *
  * Results are cached in xp->xp_files and xp->xp_numfiles, except when "mode"
  * is WILD_EXPAND_FREE or WILD_ALL.
  *
@@ -3400,7 +3404,7 @@ ExpandOne(xp, str, orig, options, mode)
            return NULL;
     }
 
-/* free old names */
+    /* free old names */
     if (xp->xp_numfiles != -1 && mode != WILD_ALL && mode != WILD_LONGEST)
     {
        FreeWild(xp->xp_numfiles, xp->xp_files);
@@ -3541,6 +3545,10 @@ ExpandOne(xp, str, orig, options, mode)
     if (mode == WILD_EXPAND_FREE || mode == WILD_ALL)
        ExpandCleanup(xp);
 
+    /* Free "orig" if it wasn't stored in "orig_save". */
+    if (orig != orig_save)
+       vim_free(orig);
+
     return ss;
 }
 

diff --git a/src/version.c b/src/version.c
index 6714a9205ad14a726d069796c312e2eb61433e1e..05bfe5a19d785aacd64d5c73d9998360ab202ce4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    127,
 /**/
     126,
 /**/