wyj/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-09-17 20:58:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

docs: fix typos (#18269)

Browse Source 
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
Co-authored-by: Dan Sully <dan+github@sully.org>
Co-authored-by: saher <msaher.shair@gmail.com>
Co-authored-by: Stephan Seitz <stephan.seitz@fau.de>
Co-authored-by: Benedikt Müller <d12bb@posteo.de>
Co-authored-by: Andrey Mishchenko <mishchea@gmail.com>
Co-authored-by: Famiu Haque <famiuhaque@protonmail.com>
Co-authored-by: Oliver Marriott <hello@omarriott.com>
This commit is contained in:
dundargoc 2022-06-04 05:56:36 +02:00 committed by GitHub
parent 86cc33a464
commit ff20d40321
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
runtime/doc/api.txt
View File

@ -1625,8 +1625,7 @@ nvim_set_hl({ns_id}, {name}, {*val}) *nvim_set_hl()*
• reverse: boolean
• nocombine: boolean
• link: name of another highlight group to link
to, see |:hi-link|. Additionally, the following
keys are recognized:
to, see |:hi-link|.
• default: Don't override existing definition
|:hi-default|
• ctermfg: Sets foreground of cterm color

2
runtime/doc/lsp.txt
View File

@ -987,7 +987,7 @@ start_client({config}) *vim.lsp.start_client()*
default true): Allow using
incremental sync for buffer edits
• debounce_text_changes (number,
default nil): Debounce didChange
default 150): Debounce didChange
notifications to the server by the
given number in milliseconds. No
debounce occurs if nil

2
runtime/doc/lua.txt
View File

@ -1092,7 +1092,7 @@ vim.env *vim.env*
*lua-vim-optlocal*
*lua-vim-setlocal*
In Vimscript, there is an way to set options |set-option|. In Lua, the
In Vimscript, there is a way to set options |set-option|. In Lua, the
corresponding method is `vim.opt`.
`vim.opt` provides several conveniences for setting and controlling options

2
runtime/doc/usr_05.txt
View File

@ -45,7 +45,7 @@ This file is always used and is recommended:
The vimrc file can contain all the commands that you type after a colon. The
simplest ones are for setting options. For example, if you want Vim to always
start with the 'incsearch' option on, add this line your vimrc file: >
start with the 'ignorecase' option on, add this line your vimrc file: >
set ignorecase

2
runtime/lua/vim/lsp.lua
View File

@ -836,7 +836,7 @@ end
--- server in the initialize request. Invalid/empty values will default to "off"
---@param flags: A table with flags for the client. The current (experimental) flags are:
--- - allow_incremental_sync (bool, default true): Allow using incremental sync for buffer edits
--- - debounce_text_changes (number, default nil): Debounce didChange
--- - debounce_text_changes (number, default 150): Debounce didChange
--- notifications to the server by the given number in milliseconds. No debounce
--- occurs if nil
--- - exit_timeout (number, default 500): Milliseconds to wait for server to

2
runtime/optwin.vim
View File

@ -469,7 +469,7 @@ endif
call <SID>Header("multiple windows")
call append("$", "laststatus\t0, 1 or 2; when to use a status line for the last window")
call append("$", "laststatus\t0, 1, 2 or 3; when to use a status line for the last window")
call append("$", " \tset ls=" . &ls)
if has("statusline")
call append("$", "statusline\talternate format to be used for a status line")

1
src/nvim/api/vim.c
View File

@ -157,7 +157,6 @@ Dictionary nvim__get_hl_defs(Integer ns_id, Error *err)
/// - reverse: boolean
/// - nocombine: boolean
/// - link: name of another highlight group to link to, see |:hi-link|.
/// Additionally, the following keys are recognized:
/// - default: Don't override existing definition |:hi-default|
/// - ctermfg: Sets foreground of cterm color |highlight-ctermfg|
/// - ctermbg: Sets background of cterm color |highlight-ctermbg|

1
src/nvim/ex_getln.c
View File

@ -2553,7 +2553,6 @@ static int command_line_changed(CommandLineState *s)
}
}
// 'incsearch' highlighting.
if (s->firstc == ':'
&& current_sctx.sc_sid == 0 // only if interactive
&& *p_icm != NUL // 'inccommand' is set

2
src/nvim/lua/treesitter.c
View File

@ -391,7 +391,7 @@ static int parser_parse(lua_State *L)
return luaL_error(L, "An error occurred when parsing.");
}
// The new tree will be pushed to the stack, without copy, owwership is now to
// The new tree will be pushed to the stack, without copy, ownership is now to
// the lua GC.
// Old tree is still owned by the lua GC.
uint32_t n_ranges = 0;

4
src/nvim/move.c
View File

@ -108,14 +108,14 @@ void redraw_for_cursorline(win_T *wp)
}
/// Redraw when w_virtcol changes and 'cursorcolumn' is set or 'cursorlineopt'
/// contains "screenline" or when the 'CurSearch' highlight is in use.
/// contains "screenline" or when the "CurSearch" highlight is in use.
/// Also when concealing is on and 'concealcursor' is active.
static void redraw_for_cursorcolumn(win_T *wp)
FUNC_ATTR_NONNULL_ALL
{
if ((wp->w_valid & VALID_VIRTCOL) == 0 && !pum_visible()) {
if (wp->w_p_cuc || ((HL_ATTR(HLF_LC) || wp->w_hl_ids[HLF_LC]) && using_hlsearch())) {
// When 'cursorcolumn' is set or 'CurSearch' is in use
// When 'cursorcolumn' is set or "CurSearch" is in use
// need to redraw with SOME_VALID.
redraw_later(wp, SOME_VALID);
} else if (wp->w_p_cul && (wp->w_p_culopt_flags & CULOPT_SCRLINE)) {

2
src/nvim/state.c
View File

@ -137,7 +137,7 @@ bool virtual_active(void)
|| ((cur_ve_flags & VE_INSERT) && (State & MODE_INSERT));
}
/// MODE_VISUAL, MODE_SELECTMODE and MODE_OP_PENDING State are never set, they are
/// MODE_VISUAL, MODE_SELECT and MODE_OP_PENDING State are never set, they are
/// equal to MODE_NORMAL State with a condition. This function returns the real
/// State.
int get_real_state(void)

2
test/functional/api/window_spec.lua
View File

@ -153,7 +153,7 @@ describe('API/win', function()
[1] = {bold = true, foreground = Screen.colors.Blue}, -- NonText
[2] = {background = Screen.colors.Grey90}, -- CursorLine
[3] = {bold = true, reverse = true}, -- StatusLine
[4] = {reverse = true}, -- VertSplit, StatusLineNC
[4] = {reverse = true}, -- StatusLineNC
})
screen:attach()
command('set ruler')

2
test/functional/legacy/display_spec.lua
View File

@ -61,7 +61,7 @@ describe('display', function()
screen:set_default_attr_ids({
[1] = {bold = true, foreground = Screen.colors.Blue}, -- NonText
[2] = {bold = true, reverse = true}, -- StatusLine
[3] = {reverse = true}, -- VertSplit, StatusLineNC
[3] = {reverse = true}, -- StatusLineNC
})
screen:attach()
exec([[

2
test/functional/legacy/listchars_spec.lua
View File

@ -105,7 +105,7 @@ describe("'listchars'", function()
screen:set_default_attr_ids({
[1] = {bold = true, foreground = Screen.colors.Blue}, -- NonText
[2] = {bold = true, reverse = true}, -- StatusLine
[3] = {reverse = true}, -- StatusLineNC, VertSplit
[3] = {reverse = true}, -- StatusLineNC
[4] = {background = Screen.colors.Grey, foreground = Screen.colors.DarkBlue}, -- FoldColumn, SignColumn
})
screen:attach()

2
test/functional/legacy/statusline_spec.lua
View File

@ -18,7 +18,7 @@ describe('statusline', function()
screen:set_default_attr_ids({
[1] = {bold = true, foreground = Screen.colors.Blue}, -- NonText
[2] = {bold = true, reverse = true}, -- StatusLine
[3] = {reverse = true}, -- StatusLineNC, VertSplit
[3] = {reverse = true}, -- StatusLineNC
})
exec([[
setlocal statusline=-%{mode()}-

2
test/functional/options/cursorbind_spec.lua
View File

@ -13,7 +13,7 @@ describe("'cursorbind'", function()
screen:set_default_attr_ids({
[1] = {bold = true, foreground = Screen.colors.Blue}, -- NonText
[2] = {bold = true, reverse = true}, -- StatusLine
[3] = {reverse = true}, -- StatusLineNC, VertSplit
[3] = {reverse = true}, -- StatusLineNC
[4] = {background = Screen.colors.Grey90}, -- CursorLine, CursorColumn
})
screen:attach()