patch 8.0.0033

Problem:    Cannot use overlapping positions with matchaddpos().
Solution:   Check end of match. (Ozaki Kiichi) Add a test (Hirohito Higashi)

diff --git a/src/screen.c b/src/screen.c
index 5ebca09804aa16e5b9c5bec2770dbd224acce4df..0889db91d61cbbae6355d99d48c936582f55f59d 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -7786,21 +7786,23 @@ next_search_hl_pos(
     shl->lnum = 0;
     for (i = posmatch->cur; i < MAXPOSMATCH; i++)
     {
-       if (posmatch->pos[i].lnum == 0)
+       llpos_T *pos = &posmatch->pos[i];
+
+       if (pos->lnum == 0)
            break;
-       if (posmatch->pos[i].col < mincol)
+       if (pos->col + pos->len - 1 <= mincol)
            continue;
-       if (posmatch->pos[i].lnum == lnum)
+       if (pos->lnum == lnum)
        {
            if (shl->lnum == lnum)
            {
                /* partially sort positions by column numbers
                 * on the same line */
-               if (posmatch->pos[i].col < posmatch->pos[bot].col)
+               if (pos->col < posmatch->pos[bot].col)
                {
-                   llpos_T     tmp = posmatch->pos[i];
+                   llpos_T     tmp = *pos;
 
-                   posmatch->pos[i] = posmatch->pos[bot];
+                   *pos = posmatch->pos[bot];
                    posmatch->pos[bot] = tmp;
                }
            }

diff --git a/src/testdir/test_match.vim b/src/testdir/test_match.vim
index 9ac1db157f9986dc85f85fe3121390e620e679ec..3b20d5d439021e09af6fef9027c7fac1931d77d2 100644 (file)
--- a/src/testdir/test_match.vim
+++ b/src/testdir/test_match.vim
@@ -181,6 +181,16 @@ func Test_matchaddpos()
   redraw!
   call assert_equal(screenattr(2,2), screenattr(1,6))
 
+  " Check overlapping pos
+  call clearmatches()
+  call setline(1, ['1234567890', 'NH'])
+  call matchaddpos('Error', [[1,1,5], [1,3,5], [2,2]])
+  redraw!
+  call assert_notequal(screenattr(2,2), 0)
+  call assert_equal(screenattr(2,2), screenattr(1,5))
+  call assert_equal(screenattr(2,2), screenattr(1,7))
+  call assert_notequal(screenattr(2,2), screenattr(1,8))
+
   nohl
   syntax off
   set hlsearch&

diff --git a/src/version.c b/src/version.c
index 6fee4abf730f98177d105e4c6681a531e0956b7f..b2066e4e84147d704ded8fe9f6bd9104eb0d6c5c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    33,
 /**/
     32,
 /**/