thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

updated for version 7.3.150

Browse Source 
Problem:    readline() does not return the last line when the NL is missing.
            (Hong Xu)
Solution:   When at the end of the file Also check for a previous line.
This commit is contained in:
Bram Moolenaar 2011-04-01 16:07:46 +02:00
parent 96bcc5e6cd
commit 27b6056d85
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/eval.c
View File

@ -14305,9 +14305,9 @@ f_readfile(argvars, rettv)
{
if (buf[filtd] == '\n' || readlen <= 0)
{
/* Only when in binary mode add an empty list item when the
* last line ends in a '\n'. */
if (!binary && readlen == 0 && filtd == 0)
/* In binary mode add an empty list item when the last
* non-empty line ends in a '\n'. */
if (!binary && readlen == 0 && filtd == 0 && prev == NULL)
break;
/* Found end-of-line or end-of-file: add a text line to the
@ -14372,25 +14372,28 @@ f_readfile(argvars, rettv)
if (tolist == 0)
{
/* "buf" is full, need to move text to an allocated buffer */
if (prev == NULL)
if (buflen >= FREAD_SIZE / 2)
{
prev = vim_strnsave(buf, buflen);
prevlen = buflen;
}
else
{
s = alloc((unsigned)(prevlen + buflen));
if (s != NULL)
/* "buf" is full, need to move text to an allocated buffer */
if (prev == NULL)
{
mch_memmove(s, prev, prevlen);
mch_memmove(s + prevlen, buf, buflen);
vim_free(prev);
prev = s;
prevlen += buflen;
prev = vim_strnsave(buf, buflen);
prevlen = buflen;
}
else
{
s = alloc((unsigned)(prevlen + buflen));
if (s != NULL)
{
mch_memmove(s, prev, prevlen);
mch_memmove(s + prevlen, buf, buflen);
vim_free(prev);
prev = s;
prevlen += buflen;
}
}
filtd = 0;
}
filtd = 0;
}
else
{

2
src/version.c
View File

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