diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-05-13 19:37:29 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-05-13 19:37:29 +0200 |
| commit | 8df5acfda9e5a41e643066e044f4adb47bfb83ba (patch) | |
| tree | 6542d012af511153305c0c294b737c8ba0c09a4a /src/regexp.c | |
| parent | 6082bea6acae266c392cd25317414cf3a167a596 (diff) | |
| download | vim-git-8df5acfda9e5a41e643066e044f4adb47bfb83ba.tar.gz | |
updated for version 7.4.293v7.4.293
Problem: It is not possible to ignore composing characters at a specific
point in a pattern.
Solution: Add the %C item.
Diffstat (limited to 'src/regexp.c')
| -rw-r--r-- | src/regexp.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/regexp.c b/src/regexp.c index d66cd2062..26fb813c8 100644 --- a/src/regexp.c +++ b/src/regexp.c @@ -244,6 +244,7 @@ #define RE_MARK 207 /* mark cmp Match mark position */ #define RE_VISUAL 208 /* Match Visual area */ +#define RE_COMPOSING 209 /* any composing characters */ /* * Magic characters have a special meaning, they don't match literally. @@ -2208,6 +2209,10 @@ regatom(flagp) ret = regnode(RE_VISUAL); break; + case 'C': + ret = regnode(RE_COMPOSING); + break; + /* \%[abc]: Emit as a list of branches, all ending at the last * branch which matches nothing. */ case '[': @@ -4710,11 +4715,13 @@ regmatch(scan) status = RA_NOMATCH; } #ifdef FEAT_MBYTE - /* Check for following composing character. */ + /* Check for following composing character, unless %C + * follows (skips over all composing chars). */ if (status != RA_NOMATCH && enc_utf8 && UTF_COMPOSINGLIKE(reginput, reginput + len) - && !ireg_icombine) + && !ireg_icombine + && OP(next) != RE_COMPOSING) { /* raaron: This code makes a composing character get * ignored, which is the correct behavior (sometimes) @@ -4791,6 +4798,16 @@ regmatch(scan) status = RA_NOMATCH; break; #endif + case RE_COMPOSING: +#ifdef FEAT_MBYTE + if (enc_utf8) + { + /* Skip composing characters. */ + while (utf_iscomposing(utf_ptr2char(reginput))) + mb_cptr_adv(reginput); + } +#endif + break; case NOTHING: break; |