vim-patch:7.4.187

Problem:    Delete that crosses line break splits multi-byte character.
Solution:   Advance a character instead of a byte. (Cade Foster)

https://code.google.com/p/vim/source/detail?r=a1c07956171a133583df42627d3498f935e59988

src/normal.c

@@ -62,7 +62,7 @@
 static int resel_VIsual_mode = NUL;             /* 'v', 'V', or Ctrl-V */
 static linenr_T resel_VIsual_line_count;        /* number of lines */
 static colnr_T resel_VIsual_vcol;               /* nr of cols or end col */
-static int VIsual_mode_orig = NUL;              /* type of Visual mode, that user entered */
+static int VIsual_mode_orig = NUL;              /* saved Visual mode */
 
 static int restart_VIsual_select = 0;
 
@@ -4804,8 +4804,15 @@ static void nv_left(cmdarg_T *cap)
         if (       (cap->oap->op_type == OP_DELETE
                     || cap->oap->op_type == OP_CHANGE)
                    && !lineempty(curwin->w_cursor.lnum)) {
-          if (*ml_get_cursor() != NUL)
-            ++curwin->w_cursor.col;
+          char_u *cp = ml_get_cursor();
+
+          if (*cp != NUL) {
+            if (has_mbyte) {
+              curwin->w_cursor.col += (*mb_ptr2len)(cp);
+            } else {
+              curwin->w_cursor.col++;
+            }
+          }
           cap->retval |= CA_NO_ADJ_OP_END;
         }
         continue;

src/testdir/test69.in

@@ -154,6 +154,16 @@ ra test
 ａbbａ
 ａａb
 
+STARTTEST
+:set whichwrap+=h
+/^x
+dh
+:set whichwrap-=h
+ENDTEST
+
+á
+x
+
 STARTTEST
 :let a = '.é.' " one char of two bytes
 :let b = '.é.' " normal e with composing char

src/testdir/test69.ok

@@ -150,6 +150,9 @@ aaaa
 aaa
 
 
+áx
+
+
 byteidx
 [0, 1, 3, 4, -1]
 [0, 1, 4, 5, -1]

src/version.c

@@ -202,6 +202,7 @@ static char *(features[]) = {
 
 static int included_patches[] = {
   // Add new patch number below this line
+  187,
   186,
   //185,
   184,