mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
updated for version 7.2-153
This commit is contained in:
parent
77ab2801c7
commit
9439cdddf7
@ -1554,8 +1554,13 @@ recover_names(fname, list, nr)
|
|||||||
for (i = 0; i < num_files; ++i)
|
for (i = 0; i < num_files; ++i)
|
||||||
if (fullpathcmp(p, files[i], TRUE) & FPC_SAME)
|
if (fullpathcmp(p, files[i], TRUE) & FPC_SAME)
|
||||||
{
|
{
|
||||||
|
/* Remove the name from files[i]. Move further entries
|
||||||
|
* down. When the array becomes empty free it here, since
|
||||||
|
* FreeWild() won't be called below. */
|
||||||
vim_free(files[i]);
|
vim_free(files[i]);
|
||||||
--num_files;
|
if (--num_files == 0)
|
||||||
|
vim_free(files);
|
||||||
|
else
|
||||||
for ( ; i < num_files; ++i)
|
for ( ; i < num_files; ++i)
|
||||||
files[i] = files[i + 1];
|
files[i] = files[i + 1];
|
||||||
}
|
}
|
||||||
@ -3522,7 +3527,7 @@ resolve_symlink(fname, buf)
|
|||||||
if (errno == EINVAL || errno == ENOENT)
|
if (errno == EINVAL || errno == ENOENT)
|
||||||
{
|
{
|
||||||
/* Found non-symlink or not existing file, stop here.
|
/* Found non-symlink or not existing file, stop here.
|
||||||
* When at the first level use the unmodifed name, skip the
|
* When at the first level use the unmodified name, skip the
|
||||||
* call to vim_FullName(). */
|
* call to vim_FullName(). */
|
||||||
if (depth == 1)
|
if (depth == 1)
|
||||||
return FAIL;
|
return FAIL;
|
||||||
@ -4560,7 +4565,7 @@ ml_updatechunk(buf, line, len, updtype)
|
|||||||
buf->b_ml.ml_chunksize + curix,
|
buf->b_ml.ml_chunksize + curix,
|
||||||
(buf->b_ml.ml_usedchunks - curix) *
|
(buf->b_ml.ml_usedchunks - curix) *
|
||||||
sizeof(chunksize_T));
|
sizeof(chunksize_T));
|
||||||
/* Compute length of first half of lines in the splitted chunk */
|
/* Compute length of first half of lines in the split chunk */
|
||||||
size = 0;
|
size = 0;
|
||||||
linecnt = 0;
|
linecnt = 0;
|
||||||
while (curline < buf->b_ml.ml_line_count
|
while (curline < buf->b_ml.ml_line_count
|
||||||
|
@ -676,6 +676,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 */
|
||||||
|
/**/
|
||||||
|
153,
|
||||||
/**/
|
/**/
|
||||||
152,
|
152,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user