0
0
mirror of https://github.com/vim/vim.git synced 2025-10-05 05:34:07 -04:00

patch 8.2.2177: pattern "^" does not match if first character is combining

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)
This commit is contained in:
Bram Moolenaar
2020-12-21 14:54:32 +01:00
parent 6a78f32844
commit ef2dff52de
3 changed files with 18 additions and 3 deletions

View File

@@ -5754,9 +5754,11 @@ nfa_regmatch(
{ {
case NFA_MATCH: case NFA_MATCH:
{ {
// If the match ends before a composing characters and // If the match is not at the start of the line, ends before a
// rex.reg_icombine is not set, that is not really a match. // composing characters and rex.reg_icombine is not set, that
if (enc_utf8 && !rex.reg_icombine && utf_iscomposing(curc)) // is not really a match.
if (enc_utf8 && !rex.reg_icombine
&& rex.input != rex.line && utf_iscomposing(curc))
break; break;
nfa_match = TRUE; nfa_match = TRUE;

View File

@@ -501,4 +501,15 @@ func Test_search_with_end_offset()
close! close!
endfunc 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 " vim: shiftwidth=2 sts=2 expandtab

View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2177,
/**/ /**/
2176, 2176,
/**/ /**/