summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ex_cmds2.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index c8e9785cc4..b11bff43c7 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -2751,7 +2751,7 @@ ex_args(exarg_T *eap)
*/
if (ARGCOUNT > 0)
{
- char **items = (char **)alloc(sizeof(char *) * ARGCOUNT);
+ char_u **items = (char_u **)alloc(sizeof(char_u *) * ARGCOUNT);
if (items != NULL)
{
@@ -2760,7 +2760,7 @@ ex_args(exarg_T *eap)
gotocmdline(TRUE);
for (i = 0; i < ARGCOUNT; ++i)
- items[i] = (char *)alist_name(&ARGLIST[i]);
+ items[i] = alist_name(&ARGLIST[i]);
list_in_columns(items, ARGCOUNT, curwin->w_arg_idx);
vim_free(items);
}
diff --git a/src/version.c b/src/version.c
index a73994b93b..7ebc071750 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1740,
+/**/
1739,
/**/
1738,