diff options
| -rw-r--r-- | src/syntax.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/syntax.c b/src/syntax.c index 81f460470..d0d4515e0 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -2470,7 +2470,8 @@ syn_current_attr( /* nextgroup ends at end of line, unless "skipnl" or "skipempty" present */ if (current_next_list != NULL - && syn_getcurline()[current_col + 1] == NUL + && (line = syn_getcurline())[current_col] != NUL + && line[current_col + 1] == NUL && !(current_next_flags & (HL_SKIPNL | HL_SKIPEMPTY))) current_next_list = NULL; diff --git a/src/version.c b/src/version.c index f8777dcfd..ae51d723e 100644 --- a/src/version.c +++ b/src/version.c @@ -779,6 +779,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1561, +/**/ 1560, /**/ 1559, |