thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.0414: matchstr() still does not match column offset

Browse Source 
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)
This commit is contained in:
Bram Moolenaar
2022-09-08 12:17:06 +01:00
parent b0d12e63e8
commit 753aead960
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/regexp_bt.c
View File

@@ -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;
linenr_T lnum = REG_MULTI ? rex.reg_firstlnum + rex.lnum : 1;
long_u vcol;
if (lnum >= 0 && lnum <= wp->w_buffer->b_ml.ml_line_count)
vcol = (long_u)win_linetabsize(wp, lnum, rex.line,
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;