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)
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index cbfed49..6182f58 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -5754,9 +5754,11 @@
{
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 a1c06b4..7870240 100644
--- a/src/testdir/test_regexp_utf8.vim
+++ b/src/testdir/test_regexp_utf8.vim
@@ -501,4 +501,15 @@
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 5ed39fe..05f08e5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2177,
+/**/
2176,
/**/
2175,