aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/api.txt2
-rw-r--r--runtime/doc/lua-guide.txt8
-rw-r--r--runtime/doc/lua.txt2
-rw-r--r--runtime/doc/luaref.txt6
-rw-r--r--runtime/doc/news.txt7
-rw-r--r--runtime/doc/provider.txt2
6 files changed, 16 insertions, 11 deletions
diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index ed8858820e..83422c9501 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -3242,7 +3242,7 @@ nvim_create_autocmd({event}, {*opts}) *nvim_create_autocmd()*
vim.api.nvim_create_autocmd({"BufEnter", "BufWinEnter"}, {
pattern = {"*.c", "*.h"},
callback = function(ev)
- print(string.format('event fired: s', vim.inspect(ev)))
+ print(string.format('event fired: %s', vim.inspect(ev)))
end
})
<
diff --git a/runtime/doc/lua-guide.txt b/runtime/doc/lua-guide.txt
index 94db6aac0a..22f51ce8c7 100644
--- a/runtime/doc/lua-guide.txt
+++ b/runtime/doc/lua-guide.txt
@@ -114,10 +114,10 @@ Let's assume you have the following directory structure:
|-- after/
|-- ftplugin/
|-- lua/
- | |-- myluamodule.lua
- | |-- other_modules/
- | |-- anothermodule.lua
- | |-- init.lua
+ | |-- myluamodule.lua
+ | |-- other_modules/
+ | |-- anothermodule.lua
+ | |-- init.lua
|-- plugin/
|-- syntax/
|-- init.vim
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index ad9cb69ae0..da423ac213 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -3035,7 +3035,7 @@ Iter:find({self}, {f}) *Iter:find()*
Iter:fold({self}, {init}, {f}) *Iter:fold()*
Fold an iterator or table into a single value.
- Examples: >
+ Examples: >lua
-- Create a new table with only even values
local t = { a = 1, b = 2, c = 3, d = 4 }
diff --git a/runtime/doc/luaref.txt b/runtime/doc/luaref.txt
index aafdd5c43e..a01196e538 100644
--- a/runtime/doc/luaref.txt
+++ b/runtime/doc/luaref.txt
@@ -4101,16 +4101,16 @@ string.gsub({s}, {pattern}, {repl} [, {n}]) *string.gsub()*
x = string.gsub("hello world from Lua", "(%w+)%s*(%w+)", "%2 %1")
--> x="world hello Lua from"
- x = string.gsub("home = `HOME, user = ` USER", "%$(%w+)", os.getenv)
+ x = string.gsub("home = $HOME, user = $USER", "%$(%w+)", os.getenv)
--> x="home = /home/roberto, user = roberto"
- x = string.gsub("4+5 = `return 4+5` ", "% `(.-)%` ", function (s)
+ x = string.gsub("4+5 = $return 4+5$", "%$(.-)%$", function (s)
return loadstring(s)()
end)
--> x="4+5 = 9"
local t = {name="lua", version="5.1"}
- x = string.gsub(" `name%-` version.tar.gz", "%$(%w+)", t)
+ x = string.gsub("$name%-$version.tar.gz", "%$(%w+)", t)
--> x="lua-5.1.tar.gz"
<
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 31f3ff2cd1..4c864312f5 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -45,7 +45,12 @@ The following new APIs or features were added.
its initialization response, Nvim automatically sets the client's
`offset_encoding` field.
-• Dynamic registration of LSP capabilities. An implication of this change is that checking a client's `server_capabilities` is no longer a sufficient indicator to see if a server supports a feature. Instead use `client.supports_method(<method>)`. It considers both the dynamic capabilities and static `server_capabilities`.
+• Dynamic registration of LSP capabilities. An implication of this change is
+ that checking a client's `server_capabilities` is no longer a sufficient
+ indicator to see if a server supports a feature. Instead use
+ `client.supports_method(<method>)`. It considers both the dynamic
+ capabilities and static `server_capabilities`.
+
• |vim.iter()| provides a generic iterator interface for tables and Lua
iterators |luaref-in|.
diff --git a/runtime/doc/provider.txt b/runtime/doc/provider.txt
index 117997cec2..a476a56877 100644
--- a/runtime/doc/provider.txt
+++ b/runtime/doc/provider.txt
@@ -189,8 +189,8 @@ registers. Nvim looks for these clipboard tools, in order of priority:
- pbcopy, pbpaste (macOS)
- wl-copy, wl-paste (if $WAYLAND_DISPLAY is set)
- waycopy, waypaste (if $WAYLAND_DISPLAY is set)
- - xclip (if $DISPLAY is set)
- xsel (if $DISPLAY is set)
+ - xclip (if $DISPLAY is set)
- lemonade (for SSH) https://github.com/pocke/lemonade
- doitclient (for SSH) https://www.chiark.greenend.org.uk/~sgtatham/doit/
- win32yank (Windows)