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.2-275

Browse Source
This commit is contained in:
Bram Moolenaar 2009-11-03 14:33:17 +00:00
parent ec98647b1c
commit 740885b78b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/memline.c
View File

@ -1285,7 +1285,7 @@ ml_recover()
for (i = 0; i < dp->db_line_count; ++i) for (i = 0; i < dp->db_line_count; ++i)
{ {
txt_start = (dp->db_index[i] & DB_INDEX_MASK); txt_start = (dp->db_index[i] & DB_INDEX_MASK);
if (txt_start <= HEADER_SIZE if (txt_start <= (int)HEADER_SIZE
|| txt_start >= (int)dp->db_txt_end) || txt_start >= (int)dp->db_txt_end)
{ {
p = (char_u *)"???"; p = (char_u *)"???";
@ -1296,7 +1296,8 @@ ml_recover()
ml_append(lnum++, p, (colnr_T)0, TRUE); ml_append(lnum++, p, (colnr_T)0, TRUE);
} }
if (has_error) if (has_error)
ml_append(lnum++, (char_u *)_("???END"), (colnr_T)0, TRUE); ml_append(lnum++, (char_u *)_("???END"),
(colnr_T)0, TRUE);
} }
} }
} }
@ -3576,11 +3577,10 @@ resolve_symlink(fname, buf)
* Make swap file name out of the file name and a directory name. * Make swap file name out of the file name and a directory name.
* Returns pointer to allocated memory or NULL. * Returns pointer to allocated memory or NULL.
*/ */
/*ARGSUSED*/
char_u * char_u *
makeswapname(fname, ffname, buf, dir_name) makeswapname(fname, ffname, buf, dir_name)
char_u *fname; char_u *fname;
char_u *ffname; char_u *ffname UNUSED;
buf_T *buf; buf_T *buf;
char_u *dir_name; char_u *dir_name;
{ {

2
src/version.c
View File

@ -676,6 +676,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 */
/**/
275,
/**/ /**/
274, 274,
/**/ /**/