Mercurial > vim
changeset 11275:5c77ca0cf6a5 v8.0.0523
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.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 29 Mar 2017 20:00:05 +0200 |
| parents | 8098a825f007 |
| children | 98f84fe8eb77 |
| files | src/search.c src/testdir/test_normal.vim src/version.c |
| diffstat | 3 files changed, 23 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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; } }
--- 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