Mercurial > vim
diff src/regexp_bt.c @ 30156:d58331e0f14a v9.0.0414
patch 9.0.0414: matchstr() still does not match column offset
Commit: https://github.com/vim/vim/commit/753aead960f163d0d3f8ce523ea523f2e0cec06d
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Sep 8 12:17:06 2022 +0100
patch 9.0.0414: matchstr() still does not match column offset
Problem: matchstr() still does not match column offset when done after a
text search.
Solution: Only use the line number for a multi-line search. Fix the test.
(closes #10938)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 08 Sep 2022 13:30:03 +0200 |
| parents | 22a5ccc0d634 |
| children | 7fb4e244b16e |
line wrap: on
line diff
--- a/src/regexp_bt.c +++ b/src/regexp_bt.c @@ -3441,11 +3441,13 @@ regmatch( case RE_VCOL: { win_T *wp = rex.reg_win == NULL ? curwin : rex.reg_win; - linenr_T lnum = rex.reg_firstlnum + rex.lnum; - long_u vcol = 0; - - if (lnum >= 0 && lnum <= wp->w_buffer->b_ml.ml_line_count) - vcol = (long_u)win_linetabsize(wp, lnum, rex.line, + linenr_T lnum = REG_MULTI ? rex.reg_firstlnum + rex.lnum : 1; + long_u vcol; + + if (REG_MULTI && (lnum <= 0 + || lnum > wp->w_buffer->b_ml.ml_line_count)) + lnum = 1; + vcol = (long_u)win_linetabsize(wp, lnum, rex.line, (colnr_T)(rex.input - rex.line)); if (!re_num_cmp(vcol + 1, scan)) status = RA_NOMATCH;