aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/index.txt1
-rw-r--r--runtime/doc/lsp.txt14
-rw-r--r--runtime/doc/luaref.txt2
-rw-r--r--runtime/doc/map.txt2
-rw-r--r--runtime/doc/vim_diff.txt1
-rw-r--r--runtime/lua/nvim/health.lua2
-rw-r--r--runtime/lua/vim/lsp/client.lua2
-rw-r--r--runtime/lua/vim/lsp/util.lua2
-rw-r--r--runtime/tutor/en/vim-01-beginner.tutor16
9 files changed, 21 insertions, 21 deletions
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index c1a8aec40e..969346c4c7 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -699,7 +699,6 @@ tag char note action in Normal mode ~
tag char note action in Normal mode ~
------------------------------------------------------------------------------ ~
-g_CTRL-A g CTRL-A dump a memory profile
|g_CTRL-G| g CTRL-G show information about current cursor
position
|g_CTRL-H| g CTRL-H start Select block mode
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index eb37cb2a6f..cecf7c8d38 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -978,9 +978,9 @@ Lua module: vim.lsp.client *lsp-client*
case-sensitive.
• {flags} (`table`) A table with flags for the client.
The current (experimental) flags are:
- • {allow_incremental_sync}? (`boolean`) Allow
- using incremental sync for buffer edits
- (defailt: `true`)
+ • {allow_incremental_sync}? (`boolean`,
+ default: `true`) Allow using incremental
+ sync for buffer edits
• {debounce_text_changes} (`integer`, default:
`150`) Debounce `didChange` notifications to
the server by the given number in
@@ -1149,9 +1149,9 @@ Lua module: vim.lsp.client *lsp-client*
initialize request. Invalid/empty values will
• {flags}? (`table`) A table with flags for the client. The
current (experimental) flags are:
- • {allow_incremental_sync}? (`boolean`) Allow
- using incremental sync for buffer edits
- (defailt: `true`)
+ • {allow_incremental_sync}? (`boolean`, default:
+ `true`) Allow using incremental sync for
+ buffer edits
• {debounce_text_changes} (`integer`, default:
`150`) Debounce `didChange` notifications to
the server by the given number in
@@ -2096,7 +2096,7 @@ rename({old_fname}, {new_fname}, {opts}) *vim.lsp.util.rename()*
It deletes existing buffers that conflict with the renamed file name only
when
• `opts` requests overwriting; or
- • the conflicting buffers are not loaded, so that deleting thme does not
+ • the conflicting buffers are not loaded, so that deleting them does not
result in data loss.
Parameters: ~
diff --git a/runtime/doc/luaref.txt b/runtime/doc/luaref.txt
index e7b62f4c6c..cd0b648560 100644
--- a/runtime/doc/luaref.txt
+++ b/runtime/doc/luaref.txt
@@ -932,7 +932,7 @@ implicit extra parameter `self`. Thus, the statement
is syntactic sugar for
- `t.a.b.c:f = function (self, (` `params` `)` `body` `end`
+ `t.a.b.c:f = function (` `self`, `params` `)` `body` `end`
==============================================================================
2.6 Visibility Rules *lua-visibility*
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 68206dd494..9ec34d5d52 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -604,7 +604,7 @@ instead. Example: >
map <Leader>A oanother line<Esc>
Works like: >
map \A oanother line<Esc>
-But after:
+But after: >
let mapleader = ","
It works like: >
map ,A oanother line<Esc>
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index b0caf9fdaf..a76166abf7 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -80,6 +80,7 @@ Defaults *nvim-defaults*
- 'tags' defaults to "./tags;,tags"
- 'termguicolors' is enabled by default if Nvim can detect support from the
host terminal
+- 'ttimeout' is enabled
- 'ttimeoutlen' defaults to 50
- 'ttyfast' is always set
- 'undodir' defaults to ~/.local/state/nvim/undo// (|xdg|), auto-created
diff --git a/runtime/lua/nvim/health.lua b/runtime/lua/nvim/health.lua
index 0480e4df4e..585c8deaee 100644
--- a/runtime/lua/nvim/health.lua
+++ b/runtime/lua/nvim/health.lua
@@ -17,7 +17,7 @@ local shell_error = function()
return vim.v.shell_error ~= 0
end
-local suggest_faq = 'https://github.com/neovim/neovim/blob/docs/install/BUILD.md#building'
+local suggest_faq = 'https://github.com/neovim/neovim/blob/master/BUILD.md#building'
local function check_runtime()
health.start('Runtime')
diff --git a/runtime/lua/vim/lsp/client.lua b/runtime/lua/vim/lsp/client.lua
index ff0db166d5..d48be131f3 100644
--- a/runtime/lua/vim/lsp/client.lua
+++ b/runtime/lua/vim/lsp/client.lua
@@ -15,7 +15,7 @@ local validate = vim.validate
--- @inlinedoc
---
--- Allow using incremental sync for buffer edits
---- (defailt: `true`)
+--- (default: `true`)
--- @field allow_incremental_sync? boolean
---
--- Debounce `didChange` notifications to the server by the given number in milliseconds.
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index f8e5b6a90d..fc99f54d03 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -690,7 +690,7 @@ end
---
--- It deletes existing buffers that conflict with the renamed file name only when
--- * `opts` requests overwriting; or
---- * the conflicting buffers are not loaded, so that deleting thme does not result in data loss.
+--- * the conflicting buffers are not loaded, so that deleting them does not result in data loss.
---
--- @param old_fname string
--- @param new_fname string
diff --git a/runtime/tutor/en/vim-01-beginner.tutor b/runtime/tutor/en/vim-01-beginner.tutor
index c3decdef11..aed6cd2802 100644
--- a/runtime/tutor/en/vim-01-beginner.tutor
+++ b/runtime/tutor/en/vim-01-beginner.tutor
@@ -360,7 +360,7 @@ Fiix the errors oon thhis line and reeplace them witth undo.
7. To undo previous actions, type: `u`{normal} (lowercase u)
To undo all the changes on a line, type: `U`{normal} (capital U)
- To undo the undo's, type: `<C-r>`{normal}
+ To undo the undos, type: `<C-r>`{normal}
# Lesson 3.1: THE PUT COMMAND
@@ -508,7 +508,7 @@ NOTE: When the search reaches the end of the file it will continue at the
# Lesson 4.3: MATCHING PARENTHESES SEARCH
-** Type `%`{normal} to find a matching ),], or }. **
+** Type `%`{normal} to find a matching ), ], or }. **
1. Place the cursor on any (, [, or { in the line below marked ✓.
@@ -518,9 +518,9 @@ NOTE: When the search reaches the end of the file it will continue at the
4. Type `%`{normal} to move the cursor to the other matching bracket.
- 5. Move the cursor to another (,),[,],{ or } and see what `%`{normal} does.
+ 5. Move the cursor to another (, ), [, ], {, or } and see what `%`{normal} does.
-This ( is a test line with ('s, ['s ] and {'s } in it. ))
+This ( is a test line with ('s, ['s, ] and {'s } in it. ))
NOTE: This is very useful in debugging a program with unmatched parentheses!
@@ -582,14 +582,14 @@ NOTE: You can also select the lines you want to substitute first using visual-mo
`<C-o>`{normal} takes you back to older positions, `<C-i>`{normal} to
newer positions.
- 3. Typing `%`{normal} while the cursor is on a (,),[,],{, or } goes to its
+ 3. Typing `%`{normal} while the cursor is on a (, ), [, ], {, or } goes to its
match.
4. To substitute new for the first old in a line type
~~~ cmd
:s/old/new
~~~
- To substitute new for all 'old's on a line type
+ To substitute new for all olds on a line type
~~~ cmd
:s/old/new/g
~~~
@@ -667,7 +667,7 @@ NOTE: If you were to exit Neovim and start it again with `nvim TEST`, the file
4. Type
- `:w TEST`{vim}
+ `w TEST`{vim}
where TEST is a filename that does not exist yet. Verify that you see
@@ -762,7 +762,7 @@ Open up a line above this by typing O while the cursor is on this line.
This li will allow you to pract appendi text to a line.
This line will allow you to practice appending text to a line.
-NOTE: [a](a), [i](i) and [A](A) all go to the same Insert mode, the only
+NOTE: [a](a), [i](i), and [A](A) all go to the same Insert mode, the only
difference is where the characters are inserted.
# Lesson 6.3: ANOTHER WAY TO REPLACE
generated by cgit (git 2.34.1) at 2025-08-11 10:03:50 +0000