aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.1-127

Browse Source
This commit is contained in:
Bram Moolenaar
2007-09-30 20:11:26 +00:00
parent d089d9b33a
commit ecf4de5d69
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ex_getln.c
View File

@@ -3316,6 +3316,10 @@ nextwild(xp, type, options)
* Return a pointer to alloced memory containing the new string. * Return a pointer to alloced memory containing the new string.
* Return NULL for failure. * 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" * Results are cached in xp->xp_files and xp->xp_numfiles, except when "mode"
* is WILD_EXPAND_FREE or WILD_ALL. * is WILD_EXPAND_FREE or WILD_ALL.
* *
@@ -3400,7 +3404,7 @@ ExpandOne(xp, str, orig, options, mode)
return NULL; return NULL;
} }
/* free old names */ /* free old names */
if (xp->xp_numfiles != -1 && mode != WILD_ALL && mode != WILD_LONGEST) if (xp->xp_numfiles != -1 && mode != WILD_ALL && mode != WILD_LONGEST)
{ {
FreeWild(xp->xp_numfiles, xp->xp_files); 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) if (mode == WILD_EXPAND_FREE || mode == WILD_ALL)
ExpandCleanup(xp); ExpandCleanup(xp);
/* Free "orig" if it wasn't stored in "orig_save". */
if (orig != orig_save)
vim_free(orig);
return ss; return ss;
} }

2
src/version.c
View File

@@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
127,
/**/ /**/
126, 126,
/**/ /**/