diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-05-12 01:03:32 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-05-12 01:03:32 -0400 |
| commit | 47fefba529be9b64db4339f5a365686842cab8d2 (patch) | |
| tree | f4964b98b0f412a8d7450c209cb72564f5400592 /src | |
| parent | bac9db031335f124628895f1247b07137314035a (diff) | |
| parent | dd9dc7ae872758bc41b3016487592725daf8fc9e (diff) | |
| download | rneovim-47fefba529be9b64db4339f5a365686842cab8d2.tar.gz rneovim-47fefba529be9b64db4339f5a365686842cab8d2.tar.bz2 rneovim-47fefba529be9b64db4339f5a365686842cab8d2.zip | |
Merge pull request #4731 from jbradaric/vim-7.4.1054
vim-patch:7.4.1054
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/syntax.c | 4 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c index 41af7af55c..c3742786c9 100644 --- a/src/nvim/syntax.c +++ b/src/nvim/syntax.c @@ -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; diff --git a/src/nvim/version.c b/src/nvim/version.c index 00f8c28b5e..e4dcac7f76 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -628,7 +628,7 @@ static int included_patches[] = { // 1057, // 1056, 1055, - // 1054, + 1054, // 1053, // 1052, // 1051, |