commit 8195c180065a7f477b63f0eb4e5edb890adba0c5
parent 7d4967547b2793a29f9bd602ec6819458be1bd49
Author: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 25 Sep 2023 07:15:19 +0800
Merge pull request #25349 from zeertzjq/vim-790f9a890cee
vim-patch:790f9a890cee,960822a11f70
Diffstat:
5 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
@@ -7742,6 +7742,7 @@ strutf16len({string} [, {countcc}]) *strutf16len()*
echo strutf16len('馃槉') " returns 2
echo strutf16len('a台虂') " returns 1
echo strutf16len('a台虂', v:true) " returns 3
+<
strwidth({string}) *strwidth()*
The result is a Number, which is the number of display cells
diff --git a/runtime/doc/ft_rust.txt b/runtime/doc/ft_rust.txt
@@ -467,8 +467,8 @@ rust.vim Debugging ~
register.
:RustInfoToFile [filename] *:RustInfoToFile*
- Saves debugging info of the Vim Rust plugin to the the given
- file, overwritting it.
+ Saves debugging info of the Vim Rust plugin to the given file,
+ overwriting it.
==============================================================================
MAPPINGS *rust-mappings*
diff --git a/runtime/doc/nvim_terminal_emulator.txt b/runtime/doc/nvim_terminal_emulator.txt
@@ -482,7 +482,7 @@ The function will be called with the list of arguments so far, and a second
argument that is the name of the pty.
*gdb-version*
Only debuggers fully compatible with gdb will work. Vim uses the GDB/MI
-interface. The "new-ui" command requires gdb version 7.12 or later. if you
+interface. The "new-ui" command requires gdb version 7.12 or later. If you
get this error:
Undefined command: "new-ui". Try "help".~
Then your gdb is too old.
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
@@ -9192,6 +9192,7 @@ function vim.fn.strtrans(string) end
--- echo strutf16len('馃槉') " returns 2
--- echo strutf16len('a台虂') " returns 1
--- echo strutf16len('a台虂', v:true) " returns 3
+--- <
---
--- @param string string
--- @param countcc? 0|1
diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua
@@ -10973,7 +10973,7 @@ M.funcs = {
echo strutf16len('馃槉') " returns 2
echo strutf16len('a台虂') " returns 1
echo strutf16len('a台虂', v:true) " returns 3
-
+ <
]=],
name = 'strutf16len',
params = { { 'string', 'string' }, { 'countcc', '0|1' } },
