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

updated for version 7.0065

Browse Source
This commit is contained in:
Bram Moolenaar
2005-03-28 21:02:15 +00:00
parent 582fd85b02
commit b982ca5c88
7 changed files with 53 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/eval.c
View File

@@ -5836,7 +5836,7 @@ get_dict_tv(arg, rettv, evaluate)
item = dict_find(d, key, -1);
if (item != NULL)
{
EMSG(_("E721: Duplicate key in Dictionary"));
EMSG2(_("E721: Duplicate key in Dictionary: \"%s\""), key);
clear_tv(&tvkey);
clear_tv(&tv);
goto failret;
@@ -11218,7 +11218,7 @@ f_readfile(argvars, rettv)
}
filtd = 0;
while (cnt < maxline)
while (cnt < maxline || maxline < 0)
{
readlen = fread(buf + filtd, 1, FREAD_SIZE - filtd, fd);
buflen = filtd + readlen;
@@ -11267,7 +11267,7 @@ f_readfile(argvars, rettv)
li->li_tv.vval.v_string = s;
list_append(l, li);
if (++cnt >= maxline)
if (++cnt >= maxline && maxline >= 0)
break;
if (readlen <= 0)
break;
@@ -11307,6 +11307,17 @@ f_readfile(argvars, rettv)
}
}
/*
* For a negative line count use only the lines at the end of the file,
* free the rest.
*/
if (maxline < 0)
while (cnt > -maxline)
{
listitem_remove(l, l->lv_first);
--cnt;
}
vim_free(prev);
fclose(fd);
}