0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

updated for version 7.0-070

This commit is contained in:
Bram Moolenaar
2006-08-29 15:30:07 +00:00
parent 4100af7840
commit 89d4032cae
26 changed files with 266 additions and 256 deletions

View File

@@ -7099,7 +7099,7 @@ screenalloc(clear)
tabpage_T *tp;
#endif
static int entered = FALSE; /* avoid recursiveness */
static int did_outofmem_msg = FALSE; /* did outofmem message */
static int done_outofmem_msg = FALSE; /* did outofmem message */
/*
* Allocation of the screen buffers is done only when the size changes and
@@ -7207,14 +7207,14 @@ screenalloc(clear)
#endif
|| outofmem)
{
if (ScreenLines != NULL || !did_outofmem_msg)
if (ScreenLines != NULL || !done_outofmem_msg)
{
/* guess the size */
do_outofmem_msg((long_u)((Rows + 1) * Columns));
/* Remember we did this to avoid getting outofmem messages over
* and over again. */
did_outofmem_msg = TRUE;
done_outofmem_msg = TRUE;
}
vim_free(new_ScreenLines);
new_ScreenLines = NULL;
@@ -7242,7 +7242,7 @@ screenalloc(clear)
}
else
{
did_outofmem_msg = FALSE;
done_outofmem_msg = FALSE;
for (new_row = 0; new_row < Rows; ++new_row)
{