neovim

commit d74f9c3b947677a98103c41e0c4ad8ae54389c4e
parent 542fa8a9cc10abb8eddab25a19844d19b94f53c1
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Wed, 17 Aug 2022 09:32:46 +0800

Merge pull request #19808 from zeertzjq/vim-9.0.0220

vim-patch:9.0.{0220,0222}
Diffstat:
M
src/nvim/mbyte.c
 | 
4
++--
M
src/nvim/testdir/test_eval_stuff.vim
 | 
12
++++++++++++
M
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
@@ -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
@@ -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
@@ -1,7 +1,6 @@
 " Test for textobjects
 
 source check.vim
-CheckFeature textobjects
 
 func CpoM(line, useM, expected)
   new