diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-05-24 22:56:15 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-05-24 22:56:15 +0200 |
| commit | 872bee557e5f8ab0e4a523a6a845868a2801b17e (patch) | |
| tree | d98b78f7384d6ba1a4861ea8b4911a8a9b2417a9 /src/regexp_bt.c | |
| parent | 1e469c72ee2914fcffbcd49258036acdabd6f500 (diff) | |
| download | vim-git-872bee557e5f8ab0e4a523a6a845868a2801b17e.tar.gz | |
patch 8.2.2885: searching for \%'> does not match linewise end of linev8.2.2885
Problem: searching for \%'> does not match linewise end of line. (Tim Chase)
Solution: Match end of line if column is MAXCOL. (closes #8238)
Diffstat (limited to 'src/regexp_bt.c')
| -rw-r--r-- | src/regexp_bt.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/regexp_bt.c b/src/regexp_bt.c index afea5e4cb..70ddfe986 100644 --- a/src/regexp_bt.c +++ b/src/regexp_bt.c @@ -3357,17 +3357,29 @@ regmatch( pos = getmark_buf(rex.reg_buf, mark, FALSE); if (pos == NULL // mark doesn't exist - || pos->lnum <= 0 // mark isn't set in reg_buf - || (pos->lnum == rex.lnum + rex.reg_firstlnum - ? (pos->col == (colnr_T)(rex.input - rex.line) + || pos->lnum <= 0) // mark isn't set in reg_buf + { + status = RA_NOMATCH; + } + else + { + colnr_T pos_col = pos->lnum == rex.lnum + rex.reg_firstlnum + && pos->col == MAXCOL + ? (colnr_T)STRLEN(reg_getline( + pos->lnum - rex.reg_firstlnum)) + : pos->col; + + if ((pos->lnum == rex.lnum + rex.reg_firstlnum + ? (pos_col == (colnr_T)(rex.input - rex.line) ? (cmp == '<' || cmp == '>') - : (pos->col < (colnr_T)(rex.input - rex.line) + : (pos_col < (colnr_T)(rex.input - rex.line) ? cmp != '>' : cmp != '<')) : (pos->lnum < rex.lnum + rex.reg_firstlnum ? cmp != '>' : cmp != '<'))) status = RA_NOMATCH; + } } break; |