diff options
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/doc/lua.txt | 2 | ||||
-rw-r--r-- | runtime/doc/news.txt | 2 | ||||
-rw-r--r-- | runtime/doc/pi_netrw.txt | 2 | ||||
-rw-r--r-- | runtime/doc/quickfix.txt | 2 | ||||
-rw-r--r-- | runtime/doc/treesitter.txt | 2 | ||||
-rw-r--r-- | runtime/doc/ui.txt | 6 | ||||
-rw-r--r-- | runtime/lua/vim/_editor.lua | 2 | ||||
-rw-r--r-- | runtime/lua/vim/treesitter.lua | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt index ef6f2de95f..29b35d69a0 100644 --- a/runtime/doc/lua.txt +++ b/runtime/doc/lua.txt @@ -1709,7 +1709,7 @@ vim.paste({lines}, {phase}) *vim.paste()* -- Scrub ANSI color codes from paste input. lines[i] = line:gsub('\27%[[0-9;mK]+', '') end - overridden(lines, phase) + return overridden(lines, phase) end end)(vim.paste) < diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt index 789f895b46..11e0129f52 100644 --- a/runtime/doc/news.txt +++ b/runtime/doc/news.txt @@ -223,7 +223,7 @@ CHANGED FEATURES *news-changed* These existing features changed their behavior. -• 'scrollbind' now works properly with buffers that contain virutal lines. +• 'scrollbind' now works properly with buffers that contain virtual lines. Scrollbind works by aligning to a target top line of each window in a tab page. Previously this was done by calculating the difference between the old diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt index 81acd9cf7e..0652fb27e7 100644 --- a/runtime/doc/pi_netrw.txt +++ b/runtime/doc/pi_netrw.txt @@ -3858,7 +3858,7 @@ netrw: netrw-safe guioptions Nov 15, 2021 * removed netrw_localrm and netrw_localrmdir references - Aug 18, 2022 * (Miguel Barro) improving compatability with + Aug 18, 2022 * (Miguel Barro) improving compatibility with powershell v171: Oct 09, 2020 * included code in s:NetrwOptionsSafe() to allow |'bh'| to be set to delete when diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt index e364e7cba6..f0158dff93 100644 --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -1310,7 +1310,7 @@ make, say :make html or :make pdf. Additional arguments can be passed to groff by setting them in `b:groff_compiler_args` or `g:groff_compiler_args`. The `language` argument passed to groff is set using 'spelllang'; it can be overridden by setting -`b:groff_compiler_lang`. The default enconding is `UTF-8` and can be changed +`b:groff_compiler_lang`. The default encoding is `UTF-8` and can be changed by setting `b:groff_compiler_encoding` or `g:groff_compiler_encoding`. PANDOC *quickfix-pandoc* *compiler-pandoc* diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt index 21accda2a5..da2e8db8c9 100644 --- a/runtime/doc/treesitter.txt +++ b/runtime/doc/treesitter.txt @@ -757,7 +757,7 @@ get_captures_at_pos({bufnr}, {row}, {col}) • {col} (`integer`) Position column Return: ~ - (`{capture: string, lang: string, metadata: table}[]`) + (`{capture: string, lang: string, metadata: vim.treesitter.query.TSMetadata}[]`) get_node({opts}) *vim.treesitter.get_node()* Returns the smallest named node at the given position diff --git a/runtime/doc/ui.txt b/runtime/doc/ui.txt index 42dfcd2fe7..d37cdfb9df 100644 --- a/runtime/doc/ui.txt +++ b/runtime/doc/ui.txt @@ -398,8 +398,8 @@ numerical highlight ids to the actual attributes. `grid` will not be used anymore and the UI can free any data associated with it. -["grid_cursor_goto", grid, row, column] ~ - Makes `grid` the current grid and `row, column` the cursor position on this +["grid_cursor_goto", grid, row, col] ~ + Makes `grid` the current grid and `row, col` the cursor position on this grid. This event will be sent at most once in a `redraw` batch and indicates the visible cursor position. @@ -610,7 +610,7 @@ tabs. size). If the window was previously hidden, it should now be shown again. -["win_float_pos", grid, win, anchor, anchor_grid, anchor_row, anchor_col, focusable] ~ +["win_float_pos", grid, win, anchor, anchor_grid, anchor_row, anchor_col, focusable, zindex] ~ Display or reconfigure floating window `win`. The window should be displayed above another grid `anchor_grid` at the specified position `anchor_row` and `anchor_col`. For the meaning of `anchor` and more diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua index cb864bd974..bdca97cfb8 100644 --- a/runtime/lua/vim/_editor.lua +++ b/runtime/lua/vim/_editor.lua @@ -222,7 +222,7 @@ do --- -- Scrub ANSI color codes from paste input. --- lines[i] = line:gsub('\27%[[0-9;mK]+', '') --- end - --- overridden(lines, phase) + --- return overridden(lines, phase) --- end --- end)(vim.paste) --- ``` diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua index 8d5cd2eeec..c21e0aff07 100644 --- a/runtime/lua/vim/treesitter.lua +++ b/runtime/lua/vim/treesitter.lua @@ -261,7 +261,7 @@ end ---@param row integer Position row ---@param col integer Position column --- ----@return {capture: string, lang: string, metadata: table}[] +---@return {capture: string, lang: string, metadata: vim.treesitter.query.TSMetadata}[] function M.get_captures_at_pos(bufnr, row, col) if bufnr == 0 then bufnr = api.nvim_get_current_buf() |