mirror of
https://github.com/vim/vim.git
synced 2025-10-02 05:04:20 -04:00
updated for version 7.2-314
This commit is contained in:
@@ -4666,7 +4666,6 @@ concat_fnames(fname1, fname2, sep)
|
|||||||
return dest;
|
return dest;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(FEAT_EVAL) || defined(FEAT_GETTEXT) || defined(PROTO)
|
|
||||||
/*
|
/*
|
||||||
* Concatenate two strings and return the result in allocated memory.
|
* Concatenate two strings and return the result in allocated memory.
|
||||||
* Returns NULL when out of memory.
|
* Returns NULL when out of memory.
|
||||||
@@ -4687,7 +4686,6 @@ concat_str(str1, str2)
|
|||||||
}
|
}
|
||||||
return dest;
|
return dest;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Add a path separator to a file name, unless it already ends in a path
|
* Add a path separator to a file name, unless it already ends in a path
|
||||||
|
@@ -681,6 +681,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 */
|
||||||
|
/**/
|
||||||
|
314,
|
||||||
/**/
|
/**/
|
||||||
313,
|
313,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user