summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ex_docmd.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index a71adb874..7fe33d8e5 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -1268,7 +1268,7 @@ do_cmdline(
*/
if (did_throw)
{
- void *p = NULL;
+ char *p = NULL;
msglist_T *messages = NULL, *next;
/*
@@ -1283,7 +1283,7 @@ do_cmdline(
vim_snprintf((char *)IObuff, IOSIZE,
_("E605: Exception not caught: %s"),
current_exception->value);
- p = vim_strsave(IObuff);
+ p = (char *)vim_strsave(IObuff);
break;
case ET_ERROR:
messages = current_exception->messages;
diff --git a/src/version.c b/src/version.c
index 48ba60f2f..616f4ede8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2350,
+/**/
2349,
/**/
2348,