mirror of
https://github.com/vim/vim.git
synced 2025-10-01 04:54:07 -04:00
updated for version 7.1-147
This commit is contained in:
@@ -3353,6 +3353,7 @@ ExpandOne(xp, str, orig, options, mode)
|
|||||||
char_u *ss = NULL;
|
char_u *ss = NULL;
|
||||||
static int findex;
|
static int findex;
|
||||||
static char_u *orig_save = NULL; /* kept value of orig */
|
static char_u *orig_save = NULL; /* kept value of orig */
|
||||||
|
int orig_saved = FALSE;
|
||||||
int i;
|
int i;
|
||||||
long_u len;
|
long_u len;
|
||||||
int non_suf_match; /* number without matching suffix */
|
int non_suf_match; /* number without matching suffix */
|
||||||
@@ -3421,6 +3422,7 @@ ExpandOne(xp, str, orig, options, mode)
|
|||||||
{
|
{
|
||||||
vim_free(orig_save);
|
vim_free(orig_save);
|
||||||
orig_save = orig;
|
orig_save = orig;
|
||||||
|
orig_saved = TRUE;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Do the expansion.
|
* Do the expansion.
|
||||||
@@ -3546,7 +3548,7 @@ ExpandOne(xp, str, orig, options, mode)
|
|||||||
ExpandCleanup(xp);
|
ExpandCleanup(xp);
|
||||||
|
|
||||||
/* Free "orig" if it wasn't stored in "orig_save". */
|
/* Free "orig" if it wasn't stored in "orig_save". */
|
||||||
if (orig != orig_save)
|
if (!orig_saved)
|
||||||
vim_free(orig);
|
vim_free(orig);
|
||||||
|
|
||||||
return ss;
|
return ss;
|
||||||
|
@@ -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 */
|
||||||
|
/**/
|
||||||
|
147,
|
||||||
/**/
|
/**/
|
||||||
146,
|
146,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user