Merge pull request #4731 from jbradaric/vim-7.4.1054

vim-patch:7.4.1054
This commit is contained in:
Justin M. Keyes
2016-05-12 01:03:32 -04:00
2 changed files with 5 additions and 1 deletions

View File

@@ -5004,6 +5004,10 @@ static void syn_cmd_sync(exarg_T *eap, int syncing)
curwin->w_s->b_syn_sync_maxlines = 0;
}
} else if (STRCMP(key, "LINECONT") == 0) {
if (*next_arg == NUL) { // missing pattern
illegal = true;
break;
}
if (curwin->w_s->b_syn_linecont_pat != NULL) {
EMSG(_("E403: syntax sync: line continuations pattern specified twice"));
finished = TRUE;

View File

@@ -628,7 +628,7 @@ static int included_patches[] = {
// 1057,
// 1056,
1055,
// 1054,
1054,
// 1053,
// 1052,
// 1051,