summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-10-04 22:38:37 +0200
committerBram Moolenaar <Bram@vim.org>2012-10-04 22:38:37 +0200
commit4ccb265bd41a2048edbe4a42b1d9ca92adcc9bb9 (patch)
tree4c53af56edcee35035bda87e89a80739153761e1
parent7d11244c99bd92526429c491aea433a16f2dbd25 (diff)
updated for version 7.3.682v7.3.682
Problem: Compiler complains about incompatible types. Solution: Remove type casts. (hint by Danek Duvall)
-rw-r--r--src/edit.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/edit.c b/src/edit.c
index 5fde388f73..9017fd0f31 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -4194,8 +4194,8 @@ ins_compl_get_exp(ini)
ins_buf->b_fname == NULL
? buf_spname(ins_buf)
: ins_buf->b_sfname == NULL
- ? (char *)ins_buf->b_fname
- : (char *)ins_buf->b_sfname);
+ ? ins_buf->b_fname
+ : ins_buf->b_sfname);
(void)msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R));
}
else if (*e_cpt == NUL)
diff --git a/src/version.c b/src/version.c
index c991525c4b..143657e343 100644
--- a/src/version.c
+++ b/src/version.c
@@ -720,6 +720,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 682,
+/**/
681,
/**/
680,