patch 8.2.2911: pattern "\%V" does not match all of block selection

Problem:    Pattern "\%V" does not match all of block selection. (Rick Howe)
Solution:   Use the value of vi_curswant. (closes #8285)

diff --git a/src/regexp.c b/src/regexp.c
index e372dd44dc339687976946348624c05cdbbe597b..8c1431d3c214fa2f315f5212790006bf8867d877 100644 (file)
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -1279,6 +1279,7 @@ reg_match_visual(void)
     colnr_T    start, end;
     colnr_T    start2, end2;
     colnr_T    cols;
+    colnr_T    curswant;
 
     // Check if the buffer is the current buffer.
     if (rex.reg_buf != curbuf || VIsual.lnum == 0)
@@ -1297,6 +1298,7 @@ reg_match_visual(void)
            bot = VIsual;
        }
        mode = VIsual_mode;
+       curswant = wp->w_curswant;
     }
     else
     {
@@ -1311,6 +1313,7 @@ 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)
@@ -1331,7 +1334,7 @@ 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;
        cols = win_linetabsize(wp, rex.line, (colnr_T)(rex.input - rex.line));
        if (cols < start || cols > end - (*p_sel == 'e'))

diff --git a/src/testdir/dumps/Test_hlsearch_block_visual_match.dump b/src/testdir/dumps/Test_hlsearch_block_visual_match.dump
new file mode 100644 (file)
index 0000000..0b45678
--- /dev/null
+++ b/src/testdir/dumps/Test_hlsearch_block_visual_match.dump
@@ -0,0 +1,9 @@
+|a+0&#ffff4012@1| | +0&#ffffff0@56
+>b+0&#ffff4012@3| | +0&#ffffff0@54
+|c+0&#ffff4012@5| | +0&#ffffff0@52
+|~+0#4040ff13&| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|/+0#0000000&|\|%|V| @37|2|,|1| @10|A|l@1| 

diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim
index b265e97de1352cb46d4be380c9289d901216cc2e..49e86f872d6acbbee03d61b5f3d664cfff3eedb0 100644 (file)
--- a/src/testdir/test_search.vim
+++ b/src/testdir/test_search.vim
@@ -984,6 +984,26 @@ func Test_hlsearch_and_visual()
   call delete('Xhlvisual_script')
 endfunc
 
+func Test_hlsearch_block_visual_match()
+  CheckScreendump
+
+  let lines =<< trim END
+    set hlsearch
+    call setline(1, ['aa', 'bbbb', 'cccccc'])
+  END
+  call writefile(lines, 'Xhlsearch_block')
+  let buf = RunVimInTerminal('-S Xhlsearch_block', {'rows': 9, 'cols': 60})
+
+  call term_sendkeys(buf, "G\<C-V>$kk\<Esc>")
+  sleep 100m
+  call term_sendkeys(buf, "/\\%V\<CR>")
+  sleep 100m
+  call VerifyScreenDump(buf, 'Test_hlsearch_block_visual_match', {})
+
+  call StopVimInTerminal(buf)
+  call delete('Xhlsearch_block')
+endfunc
+
 func Test_incsearch_substitute()
   CheckOption incsearch
 

diff --git a/src/version.c b/src/version.c
index 8440b8285de30f520e19b1fba2b88a05a8de37a2..0a82a96f672389f55e06d746c4da432da7ff8120 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2911,
 /**/
     2910,
 /**/