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

updated for version 7.0-194

Browse Source
This commit is contained in:
Bram Moolenaar
2007-02-13 03:01:39 +00:00
parent b01a8b749b
commit ad40f02cd9
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/memline.c
View File

@@ -2057,10 +2057,18 @@ ml_get_buf(buf, lnum, will_change)
bhdr_T *hp; bhdr_T *hp;
DATA_BL *dp; DATA_BL *dp;
char_u *ptr; char_u *ptr;
static int recursive = 0;
if (lnum > buf->b_ml.ml_line_count) /* invalid line number */ if (lnum > buf->b_ml.ml_line_count) /* invalid line number */
{ {
if (recursive == 0)
{
/* Avoid giving this message for a recursive call, may happen when
* the GUI redraws part of the text. */
++recursive;
EMSGN(_("E315: ml_get: invalid lnum: %ld"), lnum); EMSGN(_("E315: ml_get: invalid lnum: %ld"), lnum);
--recursive;
}
errorret: errorret:
STRCPY(IObuff, "???"); STRCPY(IObuff, "???");
return IObuff; return IObuff;
@@ -2088,7 +2096,14 @@ errorret:
*/ */
if ((hp = ml_find_line(buf, lnum, ML_FIND)) == NULL) if ((hp = ml_find_line(buf, lnum, ML_FIND)) == NULL)
{ {
if (recursive == 0)
{
/* Avoid giving this message for a recursive call, may happen
* when the GUI redraws part of the text. */
++recursive;
EMSGN(_("E316: ml_get: cannot find line %ld"), lnum); EMSGN(_("E316: ml_get: cannot find line %ld"), lnum);
--recursive;
}
goto errorret; goto errorret;
} }

2
src/version.c
View File

@@ -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 */
/**/
194,
/**/ /**/
193, 193,
/**/ /**/