Merge pull request #1734 from fwalch/small-patches

vim-patch: Multiple small patches (4)

6 files changed, 24 insertions, 15 deletions

diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index 931b877a95..9b33b6732c 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -2979,9 +2979,11 @@ do_put (
         }
         if (VIsual_active)
           lnum++;
-      } while (
-        VIsual_active && lnum <= curbuf->b_visual.vi_end.lnum
-        );
+      } while (VIsual_active && lnum <= curbuf->b_visual.vi_end.lnum);
+
+      if (VIsual_active) {  /* reset lnum to the last visual line */
+        lnum--;
+      }
 
       curbuf->b_op_end = curwin->w_cursor;
       /* For "CTRL-O p" in Insert mode, put cursor after last char */
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 1bab0da79a..1c07bef3e3 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -3645,6 +3645,7 @@ set_string_option_direct (
     idx = findoption(name);
     if (idx < 0) {      /* not found (should not happen) */
       EMSG2(_(e_intern2), "set_string_option_direct()");
+      EMSG2(_("For option %s"), name);
       return;
     }
   }
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 0148979335..324171aca2 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -2962,8 +2962,13 @@ win_line (
             if (shl->startcol != MAXCOL
                 && v >= (long)shl->startcol
                 && v < (long)shl->endcol) {
+              int tmp_col = v + MB_PTR2LEN(ptr);
+
+              if (shl->endcol < tmp_col) {
+                shl->endcol = tmp_col;
+              }
               shl->attr_cur = shl->attr;
-            } else if (v >= (long)shl->endcol && shl->lnum == lnum) {
+            } else if (v == (long)shl->endcol) {
               shl->attr_cur = 0;
 
               next_search_hl(wp, shl, lnum, (colnr_T)v, cur);
diff --git a/src/nvim/search.c b/src/nvim/search.c
index ef98944a06..5158e6cd86 100644
--- a/src/nvim/search.c
+++ b/src/nvim/search.c
@@ -3294,10 +3294,11 @@ again:
   if (VIsual_active) {
     /* If the end is before the start there is no text between tags, select
      * the char under the cursor. */
-    if (lt(end_pos, start_pos))
+    if (lt(end_pos, start_pos)) {
       curwin->w_cursor = start_pos;
-    else if (*p_sel == 'e')
-      ++curwin->w_cursor.col;
+    } else if (*p_sel == 'e') {
+      inc_cursor();
+    }
     VIsual = start_pos;
     VIsual_mode = 'v';
     redraw_curbuf_later(INVERTED);      /* update the inversion */
diff --git a/src/nvim/testdir/test63.in b/src/nvim/testdir/test63.in
index db347a0a87..7fbe0ac434 100644
--- a/src/nvim/testdir/test63.in
+++ b/src/nvim/testdir/test63.in
@@ -7,9 +7,9 @@ STARTTEST
 :" --- Check that "matcharg()" returns the correct group and pattern if a match
 :" --- is defined.
 :let @r = "*** Test 1: "
-:highlight MyGroup1 ctermbg=red guibg=red
-:highlight MyGroup2 ctermbg=green guibg=green
-:highlight MyGroup3 ctermbg=blue guibg=blue
+:highlight MyGroup1 term=bold ctermbg=red guibg=red
+:highlight MyGroup2 term=italic ctermbg=green guibg=green
+:highlight MyGroup3 term=underline ctermbg=blue guibg=blue
 :match MyGroup1 /TODO/
 :2match MyGroup2 /FIXME/
 :3match MyGroup3 /XXX/
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 7eb528f91c..8e32dc54ef 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -191,18 +191,18 @@ static int included_patches[] = {
   //550,
   //549,
   //548 NA
-  //547,
+  547,
   //546,
-  //545,
+  545,
   //544 NA
   543,
   //542,
   //541,
   //540 NA
   //539,
-  //538,
+  538,
   //537,
-  //536,
+  536,
   //535,
   //534 NA
   //533,
@@ -217,7 +217,7 @@ static int included_patches[] = {
   //524,
   //523 NA
   //522,
-  //521,
+  521,
   520,
   //519,
   518,