diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-12-21 22:30:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-21 22:30:15 -0500 |
| commit | 7b65a9135e04aade4dd66b5f9dc33c74e5ac962a (patch) | |
| tree | 348d52efa9071fe2c217a5ec9c778afbdbe4555a /src/nvim/regexp.c | |
| parent | aa3b17d04a81b0430dc842b904d6bb1f046ad749 (diff) | |
| parent | 07425d45e6c4bc0525504e24aee0ad0864d71379 (diff) | |
| download | rneovim-7b65a9135e04aade4dd66b5f9dc33c74e5ac962a.tar.gz rneovim-7b65a9135e04aade4dd66b5f9dc33c74e5ac962a.tar.bz2 rneovim-7b65a9135e04aade4dd66b5f9dc33c74e5ac962a.zip | |
Merge pull request #13581 from janlazo/vim-8.2.2174
vim-patch:8.2.{2174,2175,2176,2177,2181}
Diffstat (limited to 'src/nvim/regexp.c')
| -rw-r--r-- | src/nvim/regexp.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index 2878e73573..fb08cd2727 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -3605,19 +3605,21 @@ theend: if (backpos.ga_maxlen > BACKPOS_INITIAL) ga_clear(&backpos); - // Make sure the end is never before the start. Can happen when \zs and - // \ze are used. - if (REG_MULTI) { - const lpos_T *const start = &rex.reg_mmatch->startpos[0]; - const lpos_T *const end = &rex.reg_mmatch->endpos[0]; + if (retval > 0) { + // Make sure the end is never before the start. Can happen when \zs + // and \ze are used. + if (REG_MULTI) { + const lpos_T *const start = &rex.reg_mmatch->startpos[0]; + const lpos_T *const end = &rex.reg_mmatch->endpos[0]; - if (end->lnum < start->lnum - || (end->lnum == start->lnum && end->col < start->col)) { - rex.reg_mmatch->endpos[0] = rex.reg_mmatch->startpos[0]; - } - } else { - if (rex.reg_match->endp[0] < rex.reg_match->startp[0]) { - rex.reg_match->endp[0] = rex.reg_match->startp[0]; + if (end->lnum < start->lnum + || (end->lnum == start->lnum && end->col < start->col)) { + rex.reg_mmatch->endpos[0] = rex.reg_mmatch->startpos[0]; + } + } else { + if (rex.reg_match->endp[0] < rex.reg_match->startp[0]) { + rex.reg_match->endp[0] = rex.reg_match->startp[0]; + } } } |