diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-03-29 19:48:11 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-03-29 19:48:11 +0200 |
| commit | bf3d58073f7b34b2d65d1d08a728d1164e03cceb (patch) | |
| tree | 5a2bb1cf019fa4e63f0f313c58987b6a21458f21 | |
| parent | 3fcfa35f82b9d1ef5e95051b3a45578e10c14ec3 (diff) | |
| download | vim-git-bf3d58073f7b34b2d65d1d08a728d1164e03cceb.tar.gz | |
patch 8.0.0523: dv} deletes part of a multi-byte character.v8.0.0523
Problem: dv} deletes part of a multi-byte character. (Urtica Dioica)
Solution: Include the whole character.
| -rw-r--r-- | src/search.c | 10 | ||||
| -rw-r--r-- | src/testdir/test_normal.vim | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 23 insertions, 1 deletions
diff --git a/src/search.c b/src/search.c index 71235aa08..3145e9a09 100644 --- 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 index cbae8479e..692249a2d 100644 --- 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 index 90ec27bf8..c3f118936 100644 --- 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, |