diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-12-21 14:54:32 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-12-21 14:54:32 +0100 |
| commit | ef2dff52de52c17fe1bd7c06cbb32d8955901f5a (patch) | |
| tree | 4848275973ae52a3983f995a769bc09fd6304326 | |
| parent | 6a78f328442073c32d58eafc13ce5a1ca7729eeb (diff) | |
patch 8.2.2177: pattern "^" does not match if first character is combiningv8.2.2177
Problem: Pattern "^" does not match if the first character in the line is
combining. (Rene Kita)
Solution: Do accept a match at the start of the line. (closes #6963)
| -rw-r--r-- | src/regexp_nfa.c | 8 | ||||
| -rw-r--r-- | src/testdir/test_regexp_utf8.vim | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 18 insertions, 3 deletions
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c index cbfed49b59..6182f58cdb 100644 --- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -5754,9 +5754,11 @@ nfa_regmatch( { case NFA_MATCH: { - // If the match ends before a composing characters and - // rex.reg_icombine is not set, that is not really a match. - if (enc_utf8 && !rex.reg_icombine && utf_iscomposing(curc)) + // If the match is not at the start of the line, ends before a + // composing characters and rex.reg_icombine is not set, that + // is not really a match. + if (enc_utf8 && !rex.reg_icombine + && rex.input != rex.line && utf_iscomposing(curc)) break; nfa_match = TRUE; diff --git a/src/testdir/test_regexp_utf8.vim b/src/testdir/test_regexp_utf8.vim index a1c06b4af6..78702407c4 100644 --- a/src/testdir/test_regexp_utf8.vim +++ b/src/testdir/test_regexp_utf8.vim @@ -501,4 +501,15 @@ func Test_search_with_end_offset() close! endfunc +" Check that "^" matches even when the line starts with a combining char +func Test_match_start_of_line_combining() + new + call setline(1, ['', "\u05ae", '']) + exe "normal gg/^\<CR>" + call assert_equal(2, getcurpos()[1]) + bwipe! +endfunc + + + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index 5ed39fe534..05f08e5c7a 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2177, +/**/ 2176, /**/ 2175, |