diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-03-04 16:14:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-04 16:14:25 +0100 |
| commit | fcabdf9e8351fef3ad50fea48e9c1f8420e6421e (patch) | |
| tree | c5c156c6dbf9c261d5e9422fe05b2d663b02375f /thirdparty/pcre2/src/pcre2_extuni.c | |
| parent | f173f8625d9a559b8a078bf5c4ba85ab36a2f222 (diff) | |
| parent | 0455bc64b62154b7b966c598a80ec2eb4f66d088 (diff) | |
Merge pull request #26585 from akien-mga/pcre2-10.32
pcre2: Sync with upstream 10.32
Diffstat (limited to 'thirdparty/pcre2/src/pcre2_extuni.c')
| -rw-r--r-- | thirdparty/pcre2/src/pcre2_extuni.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/thirdparty/pcre2/src/pcre2_extuni.c b/thirdparty/pcre2/src/pcre2_extuni.c index 11a0bfbdd6..237211abf7 100644 --- a/thirdparty/pcre2/src/pcre2_extuni.c +++ b/thirdparty/pcre2/src/pcre2_extuni.c @@ -129,11 +129,11 @@ while (eptr < end_subject) if ((ricount & 1) != 0) break; /* Grapheme break required */ } - /* If Extend follows E_Base[_GAZ] do not update lgb; this allows - any number of Extend before a following E_Modifier. */ + /* If Extend or ZWJ follows Extended_Pictographic, do not update lgb; this + allows any number of them before a following Extended_Pictographic. */ - if (rgb != ucp_gbExtend || - (lgb != ucp_gbE_Base && lgb != ucp_gbE_Base_GAZ)) + if ((rgb != ucp_gbExtend && rgb != ucp_gbZWJ) || + lgb != ucp_gbExtended_Pictographic) lgb = rgb; eptr += len; |