summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-11-07 17:02:30 +0000
committerBram Moolenaar <Bram@vim.org>2006-11-07 17:02:30 +0000
commit3f2d9814e58b88c7d298df849e6532791026fa53 (patch)
tree71aed3c8b824e4f5f718665ca27282d67add3723
parent6ae133b915ddf42578fd7bfb8a0dd392a2b43a7f (diff)
downloadvim-git-3f2d9814e58b88c7d298df849e6532791026fa53.tar.gz
updated for version 7.0-159v7.0.159
-rw-r--r--src/memfile.c6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/memfile.c b/src/memfile.c
index ba2a379af..eac0c0877 100644
--- a/src/memfile.c
+++ b/src/memfile.c
@@ -1028,12 +1028,12 @@ mf_read(mfp, hp)
size = page_size * hp->bh_page_count;
if (lseek(mfp->mf_fd, offset, SEEK_SET) != offset)
{
- EMSG(_("E294: Seek error in swap file read"));
+ PERROR(_("E294: Seek error in swap file read"));
return FAIL;
}
if ((unsigned)vim_read(mfp->mf_fd, hp->bh_data, size) != size)
{
- EMSG(_("E295: Read error in swap file"));
+ PERROR(_("E295: Read error in swap file"));
return FAIL;
}
return OK;
@@ -1085,7 +1085,7 @@ mf_write(mfp, hp)
offset = (off_t)page_size * nr;
if (lseek(mfp->mf_fd, offset, SEEK_SET) != offset)
{
- EMSG(_("E296: Seek error in swap file write"));
+ PERROR(_("E296: Seek error in swap file write"));
return FAIL;
}
if (hp2 == NULL) /* freed block, fill with dummy data */
diff --git a/src/version.c b/src/version.c
index 772e19cd5..cc123b228 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 159,
+/**/
158,
/**/
157,