mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-26 12:10:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #4152 'vim-patch:7.4.{798,800,805,810,811,814,815,816,817,820,825}'.

Browse Source
This commit is contained in:
Justin M. Keyes
2016-02-09 01:58:54 -05:00
parent 17ae27190d 52692d3cd3
commit b9701c2a2b
10 changed files with 77 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nvim/syntax.c
View File

@@ -4188,12 +4188,14 @@ static void syn_cmd_keyword(exarg_T *eap, int syncing)
break;
if (p[1] == NUL) {
EMSG2(_("E789: Missing ']': %s"), kw);
kw = p + 2; /* skip over the NUL */
break;
goto error;
}
if (p[1] == ']') {
kw = p + 1; /* skip over the "]" */
break;
if (p[2] != NUL) {
EMSG3(_("E890: trailing char after ']': %s]%s"),
kw, &p[2]);
goto error;
}
}
if (has_mbyte) {
int l = (*mb_ptr2len)(p + 1);
@@ -4208,6 +4210,7 @@ static void syn_cmd_keyword(exarg_T *eap, int syncing)
}
}
error:
xfree(keyword_copy);
xfree(syn_opt_arg.cont_in_list);
xfree(syn_opt_arg.next_list);
@@ -4848,9 +4851,10 @@ static char_u *get_syn_pattern(char_u *arg, synpat_T *ci)
int idx;
char_u *cpo_save;
/* need at least three chars */
if (arg == NULL || arg[1] == NUL || arg[2] == NUL)
// need at least three chars
if (arg == NULL || arg[0] == NUL || arg[1] == NUL || arg[2] == NUL) {
return NULL;
}
end = skip_regexp(arg + 1, *arg, TRUE, NULL);
if (*end != *arg) { /* end delimiter not found */