diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-05-31 22:01:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-31 22:01:09 -0400 |
| commit | 27c616d688c73c406726c949a3b664f52d4e4f04 (patch) | |
| tree | 9c668b6cc67d0592b6744f2a8b227c80c2b1cded /src/nvim/regexp.c | |
| parent | e8f0ff1d48f5e85c0e16f0a248ff1781d4d080b3 (diff) | |
| parent | c3ac9c13dffaa79827602536519bc64d65689d05 (diff) | |
| download | rneovim-27c616d688c73c406726c949a3b664f52d4e4f04.tar.gz rneovim-27c616d688c73c406726c949a3b664f52d4e4f04.tar.bz2 rneovim-27c616d688c73c406726c949a3b664f52d4e4f04.zip | |
Merge pull request #14685 from janlazo/vim-8.2.2911
vim-patch:8.1.2400,8.2.{2911,2914.2916}
Diffstat (limited to 'src/nvim/regexp.c')
| -rw-r--r-- | src/nvim/regexp.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index accf9b0bb5..6b84bb3207 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -3755,6 +3755,7 @@ static bool reg_match_visual(void) int mode; colnr_T start, end; colnr_T start2, end2; + colnr_T curswant; // Check if the buffer is the current buffer. if (rex.reg_buf != curbuf || VIsual.lnum == 0) { @@ -3770,6 +3771,7 @@ static bool reg_match_visual(void) bot = VIsual; } mode = VIsual_mode; + curswant = wp->w_curswant; } else { if (lt(curbuf->b_visual.vi_start, curbuf->b_visual.vi_end)) { top = curbuf->b_visual.vi_start; @@ -3779,6 +3781,7 @@ static bool reg_match_visual(void) bot = curbuf->b_visual.vi_start; } mode = curbuf->b_visual.vi_mode; + curswant = curbuf->b_visual.vi_curswant; } lnum = rex.lnum + rex.reg_firstlnum; if (lnum < top.lnum || lnum > bot.lnum) { @@ -3798,8 +3801,9 @@ static bool reg_match_visual(void) start = start2; if (end2 > end) end = end2; - if (top.col == MAXCOL || bot.col == MAXCOL) + if (top.col == MAXCOL || bot.col == MAXCOL || curswant == MAXCOL) { end = MAXCOL; + } unsigned int cols_u = win_linetabsize(wp, rex.line, (colnr_T)(rex.input - rex.line)); assert(cols_u <= MAXCOL); |