summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/if_cscope.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/if_cscope.c b/src/if_cscope.c
index f9e318dde..929448bcf 100644
--- a/src/if_cscope.c
+++ b/src/if_cscope.c
@@ -2518,7 +2518,7 @@ cs_resolve_file(i, name)
/* Check for csdir to be non empty to avoid empty path concatenated to
* cscope output. TODO: avoid the unnecessary alloc/free of fullname. */
vim_free(fullname);
- fullname = concat_fnames(csdir, (char_u *)name, TRUE);
+ fullname = (char *)concat_fnames(csdir, (char_u *)name, TRUE);
}
else
(void)sprintf(fullname, "%s", name);
diff --git a/src/version.c b/src/version.c
index 1033b7481..650eafcd2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 211,
+/**/
210,
/**/
209,