aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/regexp_nfa.c
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-12-21 19:11:09 -0500
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-12-21 21:27:13 -0500
commit1eab3584ba087b9de52624fc632ccde5943811c3 (patch)
treed47f4789f98c93d0b1aa79bd8077fc117356a76b /src/nvim/regexp_nfa.c
parent5e80b90ef46cdd316b9da9543cd6a80a92259ffb (diff)
downloadrneovim-1eab3584ba087b9de52624fc632ccde5943811c3.tar.gz
rneovim-1eab3584ba087b9de52624fc632ccde5943811c3.tar.bz2
rneovim-1eab3584ba087b9de52624fc632ccde5943811c3.zip
vim-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 vim/vim#6963) https://github.com/vim/vim/commit/ef2dff52de52c17fe1bd7c06cbb32d8955901f5a
Diffstat (limited to 'src/nvim/regexp_nfa.c')
-rw-r--r--src/nvim/regexp_nfa.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c
index 22cd6baf6e..feb118833d 100644
--- a/src/nvim/regexp_nfa.c
+++ b/src/nvim/regexp_nfa.c
@@ -5243,9 +5243,12 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start,
switch (t->state->c) {
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 (!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 (!rex.reg_icombine
+ && rex.input != rex.line
+ && utf_iscomposing(curc)) {
break;
}
nfa_match = true;