diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-08-17 09:32:46 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-17 09:32:46 +0800 |
| commit | d74f9c3b947677a98103c41e0c4ad8ae54389c4e (patch) | |
| tree | b5ebaae16f487a51a5184879c6189ba1e60bf4a4 | |
| parent | 542fa8a9cc10abb8eddab25a19844d19b94f53c1 (diff) | |
| parent | dd15fa70967a29e535ae189d387f2e813aaa07fb (diff) | |
| download | rneovim-d74f9c3b947677a98103c41e0c4ad8ae54389c4e.tar.gz rneovim-d74f9c3b947677a98103c41e0c4ad8ae54389c4e.tar.bz2 rneovim-d74f9c3b947677a98103c41e0c4ad8ae54389c4e.zip | |
Merge pull request #19808 from zeertzjq/vim-9.0.0220
vim-patch:9.0.{0220,0222}
| -rw-r--r-- | src/nvim/mbyte.c | 4 | ||||
| -rw-r--r-- | src/nvim/testdir/test_eval_stuff.vim | 12 | ||||
| -rw-r--r-- | src/nvim/testdir/test_textobjects.vim | 1 |
3 files changed, 14 insertions, 3 deletions
diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c index ca5a3ddbbf..b777d3933f 100644 --- a/src/nvim/mbyte.c +++ b/src/nvim/mbyte.c @@ -890,9 +890,9 @@ int utf_ptr2len_len(const char_u *p, int size) return len; } -/// Return the number of bytes occupied by a UTF-8 character in a string -/// +/// Return the number of bytes occupied by a UTF-8 character in a string. /// This includes following composing characters. +/// Returns zero for NUL. int utfc_ptr2len(const char *const p_in) FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL { diff --git a/src/nvim/testdir/test_eval_stuff.vim b/src/nvim/testdir/test_eval_stuff.vim index 811c6c946d..eff1376d3c 100644 --- a/src/nvim/testdir/test_eval_stuff.vim +++ b/src/nvim/testdir/test_eval_stuff.vim @@ -75,6 +75,18 @@ func Test_for_invalid() redraw endfunc +func Test_for_over_null_string() + let save_enc = &enc + " set enc=iso8859 + let cnt = 0 + for c in v:_null_string + let cnt += 1 + endfor + call assert_equal(0, cnt) + + let &enc = save_enc +endfunc + func Test_readfile_binary() new call setline(1, ['one', 'two', 'three']) diff --git a/src/nvim/testdir/test_textobjects.vim b/src/nvim/testdir/test_textobjects.vim index eeb2946a8b..f21d6fcb99 100644 --- a/src/nvim/testdir/test_textobjects.vim +++ b/src/nvim/testdir/test_textobjects.vim @@ -1,7 +1,6 @@ " Test for textobjects source check.vim -CheckFeature textobjects func CpoM(line, useM, expected) new |