mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-19 17:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.582 #2653

Browse Source 
Problem:    Can't match "%>80v" properly. (Axel Bender)
Solution:   Correctly handle ">". (Christian Brabandt)

https://github.com/vim/vim/commit/v7-4-582

See https://groups.google.com/d/msg/vim_dev/n-02i4FnOcw/P3Yyx1OLeXgJ

Slightly adapted due to the long_u refactoring in
2ceb1c74d5.

Reviewed-by: Florian Walch <florian@fwalch.com>

Fixes #2726
This commit is contained in:
David Bürgin
2015-05-14 14:23:50 +02:00
committed by Justin M. Keyes
parent c6da503336
commit 5a9ad68b25
4 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/nvim/regexp_nfa.c
View File

@@ -5742,17 +5742,27 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start, regsubs_T *subm
// Bail out quickly when there can't be a match, avoid the overhead of
// win_linetabsize() on long lines.
if ((col > t->state->val && op != 1)
|| (col - 1 > t->state->val && op == 1)) {
if (op != 1 && col > t->state->val) {
break;
}
uintmax_t lts = win_linetabsize(reg_win == NULL ? curwin : reg_win,
regline,
col);
assert(t->state->val >= 0);
result = nfa_re_num_cmp((uintmax_t)t->state->val,
op,
lts + 1);
result = FALSE;
win_T *wp = reg_win == NULL ? curwin : reg_win;
if (op == 1 && col - 1 > t->state->val && col > 100) {
long ts = wp->w_buffer->b_p_ts;
// Guess that a character won't use more columns than 'tabstop',
// with a minimum of 4.
if (ts < 4) {
ts = 4;
}
result = col > t->state->val * ts;
}
if (!result) {
uintmax_t lts = win_linetabsize(wp, regline, col);
assert(t->state->val >= 0);
result = nfa_re_num_cmp((uintmax_t)t->state->val, op, lts + 1);
}
if (result) {
add_here = true;
add_state = t->state->out;