diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-12-09 19:12:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-09 19:12:48 -0500 |
| commit | 638f5d5b953a117cf7855e1f6d23823ec233381f (patch) | |
| tree | 13dd67fbe2507f27a995cd7b533e331622cf3e59 /src/nvim/regexp.c | |
| parent | bfed67e00ecdf71e0c7d17b1fd802f223b42c800 (diff) | |
| parent | 9900e68ae39e701a4b713875920090ce1a28fe28 (diff) | |
| download | rneovim-638f5d5b953a117cf7855e1f6d23823ec233381f.tar.gz rneovim-638f5d5b953a117cf7855e1f6d23823ec233381f.tar.bz2 rneovim-638f5d5b953a117cf7855e1f6d23823ec233381f.zip | |
Merge pull request #13497 from seandewar/vim-8.2.2121
vim-patch:8.2.{2121,2123}
Diffstat (limited to 'src/nvim/regexp.c')
| -rw-r--r-- | src/nvim/regexp.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index 1c88bd4ba4..2878e73573 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -3605,6 +3605,22 @@ 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 (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]; + } + } + return retval; } |