# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1490810405 -7200
# Node ID 5c77ca0cf6a566e1404f07e8d6ea6059ca185b88
# Parent  8098a825f007a5b2b79442ea4540ce73d171c94d
patch 8.0.0523: dv} deletes part of a multi-byte character.

commit https://github.com/vim/vim/commit/bf3d58073f7b34b2d65d1d08a728d1164e03cceb
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Mar 29 19:48:11 2017 +0200

    patch 8.0.0523: dv} deletes part of a multi-byte character.

    Problem:    dv} deletes part of a multi-byte character. (Urtica Dioica)
    Solution:   Include the whole character.

diff --git a/src/search.c b/src/search.c
--- a/src/search.c
+++ b/src/search.c
@@ -2851,9 +2851,17 @@ findpar(
     curwin->w_cursor.lnum = curr;
     if (curr == curbuf->b_ml.ml_line_count && what != '}')
     {
-	if ((curwin->w_cursor.col = (colnr_T)STRLEN(ml_get(curr))) != 0)
+	char_u *line = ml_get(curr);
+
+	/* Put the cursor on the last character in the last line and make the
+	 * motion inclusive. */
+	if ((curwin->w_cursor.col = (colnr_T)STRLEN(line)) != 0)
 	{
 	    --curwin->w_cursor.col;
+#ifdef FEAT_MBYTE
+	    curwin->w_cursor.col -=
+			     (*mb_head_off)(line, line + curwin->w_cursor.col);
+#endif
 	    *pincl = TRUE;
 	}
     }
diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim
--- a/src/testdir/test_normal.vim
+++ b/src/testdir/test_normal.vim
@@ -2290,3 +2290,15 @@ func Test_normal_large_count()
   normal 6666666666dL
   bwipe!
 endfunc
+
+func Test_delete_until_paragraph()
+  if !has('multi_byte')
+    return
+  endif
+  new
+  normal grádv}
+  call assert_equal('á', getline(1))
+  normal grád}
+  call assert_equal('', getline(1))
+  bwipe!
+endfunc
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    523,
+/**/
     522,
 /**/
     521,