summaryrefslogtreecommitdiff
path: root/src/memline.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-11-03 14:33:17 +0000
committerBram Moolenaar <Bram@vim.org>2009-11-03 14:33:17 +0000
commit740885b78b426906c522cf7abe34ea830cfd5ab3 (patch)
treefd01f1ce5038d1f365f9cf9b48773aa155d2a221 /src/memline.c
parentec98647b1c674686778f3ab445581115a744afcd (diff)
downloadvim-git-740885b78b426906c522cf7abe34ea830cfd5ab3.tar.gz
updated for version 7.2-275v7.2.275
Diffstat (limited to 'src/memline.c')
-rw-r--r--src/memline.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/memline.c b/src/memline.c
index eba3561a7..facdeb62e 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -1285,7 +1285,7 @@ ml_recover()
for (i = 0; i < dp->db_line_count; ++i)
{
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)
{
p = (char_u *)"???";
@@ -1296,7 +1296,8 @@ ml_recover()
ml_append(lnum++, p, (colnr_T)0, TRUE);
}
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.
* Returns pointer to allocated memory or NULL.
*/
-/*ARGSUSED*/
char_u *
makeswapname(fname, ffname, buf, dir_name)
char_u *fname;
- char_u *ffname;
+ char_u *ffname UNUSED;
buf_T *buf;
char_u *dir_name;
{