diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-09-25 07:15:19 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-25 07:15:19 +0800 |
| commit | 8195c180065a7f477b63f0eb4e5edb890adba0c5 (patch) | |
| tree | a32d5f18b65368bcf19956b96fbc792d064a5ee2 | |
| parent | 7d4967547b2793a29f9bd602ec6819458be1bd49 (diff) | |
| parent | 2049e22f7f5c11d5ef34fca6c4634ac246dfa42d (diff) | |
| download | rneovim-8195c180065a7f477b63f0eb4e5edb890adba0c5.tar.gz rneovim-8195c180065a7f477b63f0eb4e5edb890adba0c5.tar.bz2 rneovim-8195c180065a7f477b63f0eb4e5edb890adba0c5.zip | |
Merge pull request #25349 from zeertzjq/vim-790f9a890cee
vim-patch:790f9a890cee,960822a11f70
| -rw-r--r-- | runtime/doc/builtin.txt | 1 | ||||
| -rw-r--r-- | runtime/doc/ft_rust.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/nvim_terminal_emulator.txt | 2 | ||||
| -rw-r--r-- | runtime/lua/vim/_meta/vimfn.lua | 1 | ||||
| -rw-r--r-- | src/nvim/eval.lua | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt index 2dd290fef1..207bf817b0 100644 --- 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 index b912f732b6..083b6f579f 100644 --- 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 index d0d535566d..0cfeb3dcb7 100644 --- 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 index 4113797759..6686661a27 100644 --- 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 index fe816ee8c2..858f7c8afd 100644 --- 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' } }, |