Skip to content

Commit 8c5af0e

Browse files
dundargocdanymatgpandersfarnoyJohnVillalovos
authored
docs: misc (neovim#28837)
Co-authored-by: Danymat <[email protected]> Co-authored-by: Gregory Anders <[email protected]> Co-authored-by: Jakub Okoński <[email protected]> Co-authored-by: John L. Villalovos <[email protected]> Co-authored-by: Maria José Solano <[email protected]> Co-authored-by: Michaili K <[email protected]> Co-authored-by: TheLeoP <[email protected]> Co-authored-by: Tobias Schmitz <[email protected]> Co-authored-by: W20MC <[email protected]> Co-authored-by: Will Hopkins <[email protected]> Co-authored-by: Yifan Hu <[email protected]> Co-authored-by: glepnir <[email protected]> Co-authored-by: prljav <[email protected]>
1 parent d490a7b commit 8c5af0e

21 files changed

+58
-57
lines changed

.mailmap

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Eisuke Kawashima <[email protected]> E Kawashima
1818
ElPiloto <[email protected]> Luis Piloto
1919
Eliseo Martínez <[email protected]> Eliseo Martínez
2020
Fabian Viöl <[email protected]> Fabian
21+
2122
2223
2324
Gaelan Steele <[email protected]> Gaelan

BUILD.md

+7-4
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ make deps
8484
- Right-click _CMakeLists.txt → Delete Cache_.
8585
- Right-click _CMakeLists.txt → Generate Cache_.
8686
- If you see an "access violation" from `ntdll`, you can ignore it and continue.
87-
4. If you set an error like `msgpackc.dll not found`, try the `nvim.exe (Install)` target. Then switch back to `nvim.exe (bin\nvim.exe)`.
87+
4. If you see an error like `msgpackc.dll not found`, try the `nvim.exe (Install)` target. Then switch back to `nvim.exe (bin\nvim.exe)`.
8888

8989
### Windows / MSVC PowerShell
9090

@@ -365,13 +365,16 @@ and replacing `neovim-unwrapped` with `neovim-dev`:
365365
nix-shell '<nixpkgs>' -A neovim-dev
366366
```
367367

368-
Neovim contains a Nix flake in the `contrib` folder, with 3 packages:
368+
A flake for Neovim is hosted at [nix-community/neovim-nightly-overlay](https://github.com/nix-community/neovim-nightly-overlay/), with 3 packages:
369369
- `neovim` to run the nightly
370370
- `neovim-debug` to run the package with debug symbols
371371
- `neovim-developer` to get all the tools to develop on `neovim`
372372

373-
Thus you can run Neovim nightly with `nix run github:neovim/neovim?dir=contrib`.
374-
Similarly to develop on Neovim: `nix develop github:neovim/neovim?dir=contrib#neovim-developer`.
373+
Thus you can run Neovim nightly with `nix run github:nix-community/neovim-nightly-overlay`.
374+
Similarly to develop on Neovim: `nix run github:nix-community/neovim-nightly-overlay#neovim-developer`.
375+
376+
To use a specific version of Neovim, you can pass `--override-input neovim-src .` to use your current directory,
377+
or a specific SHA1 like `--override-input neovim-src github:neovim/neovim/89dc8f8f4e754e70cbe1624f030fb61bded41bc2`.
375378

376379
### FreeBSD
377380

CONTRIBUTING.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ Developer guidelines
4242
make distclean
4343
make # Nvim build system uses ninja automatically, if available.
4444
```
45-
- Install `ccache` for faster rebuilds of Nvim. Nvim will use it automatically
46-
if it's found. To disable caching use:
45+
- Install `ccache` or `sccache` for faster rebuilds of Nvim. Nvim will use one
46+
of these automatically if it's found. To disable caching use:
4747
```bash
48-
CCACHE_DISABLE=true make
48+
cmake -B build -D CACHE_PRG=OFF
4949
```
5050

5151
Pull requests (PRs)

INSTALL.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ sudo rm -rf /opt/nvim
112112
sudo tar -C /opt -xzf nvim-linux64.tar.gz
113113
```
114114

115-
After this step add this to `~/.bashrc`:
115+
Then add this to your shell config (`~/.bashrc`, `~/. zshrc`, ...):
116116

117117
export PATH="$PATH:/opt/nvim-linux64/bin"
118118

@@ -129,7 +129,7 @@ To expose nvim globally:
129129
mkdir -p /opt/nvim
130130
mv nvim.appimage /opt/nvim/nvim
131131

132-
And the following line to `~/.bashrc`:
132+
And the following line to your shell config (`~/.bashrc`, `~/. zshrc`, ...):
133133

134134
export PATH="$PATH:/opt/nvim/"
135135

@@ -204,7 +204,7 @@ You can also get nightly builds of git master from the [Copr automated build sys
204204
dnf copr enable agriffis/neovim-nightly
205205
dnf install -y neovim python3-neovim
206206

207-
See the [blog post](https://arongriffis.com/2019/03/02/neovim-nightly-builds) for information on how these are built.
207+
See the [blog post](https://arongriffis.com/2019-03-02-neovim-nightly-builds) for information on how these are built.
208208

209209
### Flatpak
210210

runtime/doc/api.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -2138,14 +2138,14 @@ nvim_buf_attach({buffer}, {send_buffer}, {opts}) *nvim_buf_attach()*
21382138
|api-buffer-updates-lua|
21392139

21402140
nvim_buf_call({buffer}, {fun}) *nvim_buf_call()*
2141-
call a function with buffer as temporary current buffer
2141+
Call a function with buffer as temporary current buffer.
21422142

21432143
This temporarily switches current buffer to "buffer". If the current
2144-
window already shows "buffer", the window is not switched If a window
2145-
inside the current tabpage (including a float) already shows the buffer
2146-
One of these windows will be set as current window temporarily. Otherwise
2147-
a temporary scratch window (called the "autocmd window" for historical
2148-
reasons) will be used.
2144+
window already shows "buffer", the window is not switched. If a window
2145+
inside the current tabpage (including a float) already shows the buffer,
2146+
then one of these windows will be set as current window temporarily.
2147+
Otherwise a temporary scratch window (called the "autocmd window" for
2148+
historical reasons) will be used.
21492149

21502150
This is useful e.g. to call Vimscript functions that only work with the
21512151
current buffer/window currently, like |termopen()|.
@@ -2831,7 +2831,7 @@ nvim_set_decoration_provider({ns_id}, {opts})
28312831
["buf", bufnr, tick]
28322832
<
28332833
• on_win: called when starting to redraw a specific window. >
2834-
["win", winid, bufnr, topline, botline]
2834+
["win", winid, bufnr, toprow, botrow]
28352835
<
28362836
• on_line: called for each buffer line being redrawn. (The
28372837
interaction with fold lines is subject to change) >

runtime/doc/diagnostic.txt

+4-3
Original file line numberDiff line numberDiff line change
@@ -516,10 +516,11 @@ Lua module: vim.diagnostic *diagnostic-api*
516516
*vim.diagnostic.Opts.Jump*
517517

518518
Fields: ~
519-
{float}? (`boolean|vim.diagnostic.Opts.Float`) Default value of
520-
the {float} parameter of |vim.diagnostic.jump()|.
521-
{wrap}? (`boolean`) Default value of the {wrap} parameter of
519+
{float}? (`boolean|vim.diagnostic.Opts.Float`, default: false)
520+
Default value of the {float} parameter of
522521
|vim.diagnostic.jump()|.
522+
{wrap}? (`boolean`, default: true) Default value of the {wrap}
523+
parameter of |vim.diagnostic.jump()|.
523524
{severity}? (`vim.diagnostic.SeverityFilter`) Default value of the
524525
{severity} parameter of |vim.diagnostic.jump()|.
525526

runtime/doc/gui.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ is right aligned, and the "O" is underlined, to indicate it is the shortcut.
221221

222222
*:am* *:amenu* *:an* *:anoremenu*
223223
The ":amenu" command can be used to define menu entries for all modes at once,
224-
expect for Terminal mode. To make the command work correctly, a character is
224+
except for Terminal mode. To make the command work correctly, a character is
225225
automatically inserted for some modes:
226226
mode inserted appended ~
227227
Normal nothing nothing

runtime/doc/lsp.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -514,10 +514,10 @@ LspAttach *LspAttach*
514514
callback = function(args)
515515
local bufnr = args.buf
516516
local client = vim.lsp.get_client_by_id(args.data.client_id)
517-
if client.server_capabilities.completionProvider then
517+
if client.supports_method("textDocument/completion") then
518518
vim.bo[bufnr].omnifunc = "v:lua.vim.lsp.omnifunc"
519519
end
520-
if client.server_capabilities.definitionProvider then
520+
if client.supports_method("textDocument/definition") then
521521
vim.bo[bufnr].tagfunc = "v:lua.vim.lsp.tagfunc"
522522
end
523523
end,
@@ -874,13 +874,13 @@ start({config}, {opts}) *vim.lsp.start()*
874874
{config} (`vim.lsp.ClientConfig`) Configuration for the server. See
875875
|vim.lsp.ClientConfig|.
876876
{opts} (`table?`) Optional keyword arguments
877-
• {reuse_client}
877+
• {reuse_client}?
878878
(`fun(client: vim.lsp.Client, config: vim.lsp.ClientConfig): boolean`)
879879
Predicate used to decide if a client should be re-used.
880880
Used on all running clients. The default implementation
881881
re-uses a client if name and root_dir matches.
882-
{bufnr} (`integer`) Buffer handle to attach to if starting
883-
or re-using a client (0 for current).
882+
{bufnr}? (`integer`) Buffer handle to attach to if
883+
starting or re-using a client (0 for current).
884884
{silent}? (`boolean`) Suppress error reporting if the LSP
885885
server fails to start (default false).
886886

runtime/doc/lua-guide.txt

-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@ Vimscript are automatically converted:
225225
end
226226

227227
vim.fn.jobstart('ls', { on_stdout = print_stdout })
228-
print(vim.fn.printf('Hello from %s', 'Lua'))
229228
<
230229
This works for both |builtin-functions| and |user-function|s.
231230

runtime/doc/map.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1381,7 +1381,6 @@ completion can be enabled:
13811381
-complete=arglist file names in argument list
13821382
-complete=augroup autocmd groups
13831383
-complete=buffer buffer names
1384-
-complete=behave :behave suboptions
13851384
-complete=color color schemes
13861385
-complete=command Ex command (and arguments)
13871386
-complete=compiler compilers

runtime/doc/quickref.txt

+1
Original file line numberDiff line numberDiff line change
@@ -898,6 +898,7 @@ Short explanation of each option: *option-list*
898898
'tagstack' 'tgst' push tags onto the tag stack
899899
'term' name of the terminal
900900
'termbidi' 'tbidi' terminal takes care of bi-directionality
901+
'termguicolors' 'tgc' enable 24-bit RGB color in the TUI
901902
'textwidth' 'tw' maximum width of text that is being inserted
902903
'thesaurus' 'tsr' list of thesaurus files for keyword completion
903904
'thesaurusfunc' 'tsrfu' function to be used for thesaurus completion

runtime/doc/sign.txt

+6-9
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,12 @@ sign group allows Vim plugins to use unique signs without interfering with
6767
other plugins using signs.
6868

6969
*sign-priority*
70-
Each placed sign is assigned a priority value. When multiple signs are placed
71-
on the same line, the attributes of the sign with the highest priority is used
72-
independently of the sign group. The default priority for a sign is 10. The
73-
priority is assigned at the time of placing a sign.
74-
75-
When multiple signs that each have an icon or text are present, signs are
76-
ordered with increasing priority from left to right, up until the maximum
77-
width set in 'signcolumn'. Lower priority signs that do not fit are hidden.
78-
Highest priority signs with highlight attributes are always shown.
70+
Each placed sign is assigned a priority value independently of the sign group.
71+
The default priority for a sign is 10. When multiple signs that each have an
72+
icon or text are placed on the same line, signs are ordered with decreasing
73+
priority from left to right, up until the maximum width set in 'signcolumn'.
74+
Lower priority signs that do not fit are hidden. Highest priority signs with
75+
highlight attributes are always shown.
7976

8077
When the line on which the sign is placed is deleted, the sign is removed along
8178
with it.

runtime/lua/vim/_editor.lua

+2-3
Original file line numberDiff line numberDiff line change
@@ -608,10 +608,9 @@ end
608608

609609
--- Displays a notification to the user.
610610
---
611-
--- This function can be overridden by plugins to display notifications using a
612-
--- custom provider (such as the system notification provider). By default,
611+
--- This function can be overridden by plugins to display notifications using
612+
--- a custom provider (such as the system notification provider). By default,
613613
--- writes to |:messages|.
614-
---
615614
---@param msg string Content of the notification to show to the user.
616615
---@param level integer|nil One of the values from |vim.log.levels|.
617616
---@param opts table|nil Optional parameters. Unused by default.

runtime/lua/vim/_meta/api.lua

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

runtime/lua/vim/_options.lua

-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
local api = vim.api
9696

9797
-- TODO(tjdevries): Improve option metadata so that this doesn't have to be hardcoded.
98-
-- Can be done in a separate PR.
9998
local key_value_options = {
10099
fillchars = true,
101100
fcs = true,

runtime/lua/vim/diagnostic.lua

+2
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,11 @@ local M = {}
247247
--- @class vim.diagnostic.Opts.Jump
248248
---
249249
--- Default value of the {float} parameter of |vim.diagnostic.jump()|.
250+
--- (default: false)
250251
--- @field float? boolean|vim.diagnostic.Opts.Float
251252
---
252253
--- Default value of the {wrap} parameter of |vim.diagnostic.jump()|.
254+
--- (default: true)
253255
--- @field wrap? boolean
254256
---
255257
--- Default value of the {severity} parameter of |vim.diagnostic.jump()|.

runtime/lua/vim/lsp.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,10 @@ end
201201
--- Predicate used to decide if a client should be re-used. Used on all
202202
--- running clients. The default implementation re-uses a client if name and
203203
--- root_dir matches.
204-
--- @field reuse_client fun(client: vim.lsp.Client, config: vim.lsp.ClientConfig): boolean
204+
--- @field reuse_client? fun(client: vim.lsp.Client, config: vim.lsp.ClientConfig): boolean
205205
---
206206
--- Buffer handle to attach to if starting or re-using a client (0 for current).
207-
--- @field bufnr integer
207+
--- @field bufnr? integer
208208
---
209209
--- Suppress error reporting if the LSP server fails to start (default false).
210210
--- @field silent? boolean

runtime/tutor/en/vim-01-beginner.tutor

+1-1
Original file line numberDiff line numberDiff line change
@@ -888,7 +888,7 @@ NOTE: If you want to ignore case for just one search command, use [\c](/\c)
888888

889889
Neovim has a comprehensive online help system.
890890

891-
To get started, try one of these three:
891+
To get started, try one of these two:
892892

893893
- press the `<F1>`{normal} key (if you have one)
894894
- type `:help`{vim}

src/man/nvim.1

+2-2
Original file line numberDiff line numberDiff line change
@@ -387,10 +387,10 @@ features like
387387
.El
388388
.Sh FILES
389389
.Bl -tag -width "~/.config/nvim/init.vim"
390-
.It Pa ~/.config/nvim/init.vim
390+
.It Pa ~/.config/nvim/init.lua
391391
User-local
392392
.Nm
393-
configuration file.
393+
Lua configuration file.
394394
.It Pa ~/.config/nvim
395395
User-local
396396
.Nm

src/nvim/api/buffer.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1183,12 +1183,12 @@ ArrayOf(Integer, 2) nvim_buf_get_mark(Buffer buffer, String name, Arena *arena,
11831183
return rv;
11841184
}
11851185

1186-
/// call a function with buffer as temporary current buffer
1186+
/// Call a function with buffer as temporary current buffer.
11871187
///
11881188
/// This temporarily switches current buffer to "buffer".
1189-
/// If the current window already shows "buffer", the window is not switched
1189+
/// If the current window already shows "buffer", the window is not switched.
11901190
/// If a window inside the current tabpage (including a float) already shows the
1191-
/// buffer One of these windows will be set as current window temporarily.
1191+
/// buffer, then one of these windows will be set as current window temporarily.
11921192
/// Otherwise a temporary scratch window (called the "autocmd window" for
11931193
/// historical reasons) will be used.
11941194
///

src/nvim/api/extmark.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1038,7 +1038,7 @@ void nvim_buf_clear_namespace(Buffer buffer, Integer ns_id, Integer line_start,
10381038
/// ```
10391039
/// - on_win: called when starting to redraw a specific window.
10401040
/// ```
1041-
/// ["win", winid, bufnr, topline, botline]
1041+
/// ["win", winid, bufnr, toprow, botrow]
10421042
/// ```
10431043
/// - on_line: called for each buffer line being redrawn.
10441044
/// (The interaction with fold lines is subject to change)

0 commit comments

Comments
 (0)