From ccdbab7810bd40a44a0a502d478b0d06073388e9 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Wed, 17 Jul 2024 10:38:40 +0800 Subject: vim-patch:9.0.0407: matchstr() does match column offset Problem: matchstr() does match column offset. (Yasuhiro Matsumoto) Solution: Accept line number zero. (closes vim/vim#10938) https://github.com/vim/vim/commit/75a115e8d632e96b4f45dc5145ba261876a83dcf Co-authored-by: Bram Moolenaar --- src/nvim/regexp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index 52420cf64f..22859a1e54 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -6259,7 +6259,7 @@ static bool regmatch(uint8_t *scan, const proftime_T *tm, int *timed_out) linenr_T lnum = rex.reg_firstlnum + rex.lnum; int vcol = 0; - if (lnum > 0 && lnum <= wp->w_buffer->b_ml.ml_line_count) { + if (lnum >= 0 && lnum <= wp->w_buffer->b_ml.ml_line_count) { vcol = win_linetabsize(wp, lnum, (char *)rex.line, (colnr_T)(rex.input - rex.line)); } @@ -15108,7 +15108,7 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start, regsubs_T *subm linenr_T lnum = rex.reg_firstlnum + rex.lnum; int vcol = 0; - if (lnum > 0 && lnum <= wp->w_buffer->b_ml.ml_line_count) { + if (lnum >= 0 && lnum <= wp->w_buffer->b_ml.ml_line_count) { vcol = win_linetabsize(wp, lnum, (char *)rex.line, col); } assert(t->state->val >= 0); -- cgit