summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ex_getln.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 09f2842833..7f02b88984 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -4130,7 +4130,7 @@ get_cmdline_completion(void)
return NULL;
p = get_ccline_ptr();
- if (p && p->xpc != NULL)
+ if (p != NULL && p->xpc != NULL)
{
char_u *cmd_compl;
@@ -4138,7 +4138,7 @@ get_cmdline_completion(void)
cmd_compl = cmdcomplete_type_to_str(p->xpc->xp_context);
if (cmd_compl != NULL)
- return vim_strnsave(cmd_compl, strlen((char *)cmd_compl));
+ return vim_strsave(cmd_compl);
}
return NULL;
diff --git a/src/version.c b/src/version.c
index 79e89aa623..4a4c7a9fc5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4910,
+/**/
4909,
/**/
4908,