aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.0-231

Browse Source
This commit is contained in:
Bram Moolenaar 2007-04-26 15:21:56 +00:00
parent d267b9c167
commit 1c53628518
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/memline.c
View File

@ -1015,18 +1015,39 @@ ml_recover()
msg_end(); msg_end();
goto theend; goto theend;
} }
/* /*
* If we guessed the wrong page size, we have to recalculate the * If we guessed the wrong page size, we have to recalculate the
* highest block number in the file. * highest block number in the file.
*/ */
if (mfp->mf_page_size != (unsigned)char_to_long(b0p->b0_page_size)) if (mfp->mf_page_size != (unsigned)char_to_long(b0p->b0_page_size))
{ {
unsigned previous_page_size = mfp->mf_page_size;
mf_new_page_size(mfp, (unsigned)char_to_long(b0p->b0_page_size)); mf_new_page_size(mfp, (unsigned)char_to_long(b0p->b0_page_size));
if (mfp->mf_page_size < previous_page_size)
{
msg_start();
msg_outtrans_attr(mfp->mf_fname, attr | MSG_HIST);
MSG_PUTS_ATTR(_(" has been damaged (page size is smaller than minimum value).\n"),
attr | MSG_HIST);
msg_end();
goto theend;
}
if ((size = lseek(mfp->mf_fd, (off_t)0L, SEEK_END)) <= 0) if ((size = lseek(mfp->mf_fd, (off_t)0L, SEEK_END)) <= 0)
mfp->mf_blocknr_max = 0; /* no file or empty file */ mfp->mf_blocknr_max = 0; /* no file or empty file */
else else
mfp->mf_blocknr_max = (blocknr_T)(size / mfp->mf_page_size); mfp->mf_blocknr_max = (blocknr_T)(size / mfp->mf_page_size);
mfp->mf_infile_count = mfp->mf_blocknr_max; mfp->mf_infile_count = mfp->mf_blocknr_max;
/* need to reallocate the memory used to store the data */
p = alloc(mfp->mf_page_size);
if (p == NULL)
goto theend;
mch_memmove(p, hp->bh_data, previous_page_size);
vim_free(hp->bh_data);
hp->bh_data = p;
b0p = (ZERO_BL *)(hp->bh_data);
} }
/* /*

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 */
/**/
231,
/**/ /**/
230, 230,
/**/ /**/