diff options
| -rw-r--r-- | runtime/doc/api.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/diagnostic.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/lsp.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/luvref.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/vim_diff.txt | 1 | ||||
| -rw-r--r-- | runtime/lua/vim/_meta/api.lua | 2 | ||||
| -rw-r--r-- | src/nvim/api/extmark.c | 2 | ||||
| -rw-r--r-- | test/functional/editor/defaults_spec.lua | 2 | ||||
| -rw-r--r-- | test/old/testdir/setup.vim | 2 |
9 files changed, 10 insertions, 9 deletions
diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt index 4f76e7e058..d3d18e9d6b 100644 --- a/runtime/doc/api.txt +++ b/runtime/doc/api.txt @@ -2649,8 +2649,8 @@ nvim_buf_set_extmark({buffer}, {ns_id}, {line}, {col}, {opts}) lines are placed below the buffer line containing the mark. • virt_lines_above: place virtual lines above instead. - • virt_lines_leftcol: Place extmarks in the leftmost column - of the window, bypassing sign and number columns. + • virt_lines_leftcol: Place virtual lines in the leftmost + column of the window, bypassing sign and number columns. • ephemeral : for use with |nvim_set_decoration_provider()| callbacks. The mark will only be used for the current redraw cycle, and not be permantently stored in the diff --git a/runtime/doc/diagnostic.txt b/runtime/doc/diagnostic.txt index 5e1e04ce56..bbc1d1de2c 100644 --- a/runtime/doc/diagnostic.txt +++ b/runtime/doc/diagnostic.txt @@ -373,7 +373,7 @@ EVENTS *diagnostic-events* *DiagnosticChanged* DiagnosticChanged After diagnostics have changed. When used from Lua, the new diagnostics are passed to the autocmd - callback in the "data" table. + callback in the "data" table. Triggered per buffer. Example: >lua diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt index 93b5d3cdcc..37f4d43e2c 100644 --- a/runtime/doc/lsp.txt +++ b/runtime/doc/lsp.txt @@ -119,7 +119,7 @@ Results in the configuration: >lua root_markers = { '.clangd', 'compile_commands.json' }, -- From the clangd configuration in init.lua - -- Overrides the * configuration in init.lua + -- Overrides the clangd configuration in <rtp>/lsp/clangd.lua filetypes = { 'c' }, -- From the * configuration in init.lua diff --git a/runtime/doc/luvref.txt b/runtime/doc/luvref.txt index 3cbdb53e01..648060e1d5 100644 --- a/runtime/doc/luvref.txt +++ b/runtime/doc/luvref.txt @@ -226,7 +226,7 @@ ERROR HANDLING *luv-error-handling* In libuv, errors are represented by negative numbered constants. While these constants are made available in the `uv.errno` table, they are not returned by -luv funtions and the libuv functions used to handle them are not exposed. +luv functions and the libuv functions used to handle them are not exposed. Instead, if an internal error is encountered, the failing luv function will return to the caller an assertable `nil, err, name` tuple: diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index eae341da49..1e1f6c4db7 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -46,6 +46,7 @@ Defaults *defaults* *nvim-defaults* - 'compatible' is always disabled - 'complete' excludes "i" - 'define' defaults to "". The C ftplugin sets it to "^\\s*#\\s*define" +- 'diffopt' defaults to "internal,filler,closeoff,linematch:40" - 'directory' defaults to ~/.local/state/nvim/swap// (|xdg|), auto-created - 'display' defaults to "lastline" - 'encoding' is UTF-8 (cf. 'fileencoding' for file-content encoding) diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua index 3d10729d23..96ee376882 100644 --- a/runtime/lua/vim/_meta/api.lua +++ b/runtime/lua/vim/_meta/api.lua @@ -638,7 +638,7 @@ function vim.api.nvim_buf_line_count(buffer) end --- placed below the buffer line containing the mark. --- --- - virt_lines_above: place virtual lines above instead. ---- - virt_lines_leftcol: Place extmarks in the leftmost +--- - virt_lines_leftcol: Place virtual lines in the leftmost --- column of the window, bypassing --- sign and number columns. --- diff --git a/src/nvim/api/extmark.c b/src/nvim/api/extmark.c index 8b31196eef..2cf9221e52 100644 --- a/src/nvim/api/extmark.c +++ b/src/nvim/api/extmark.c @@ -445,7 +445,7 @@ Array nvim_buf_get_extmarks(Buffer buffer, Integer ns_id, Object start, Object e /// placed below the buffer line containing the mark. /// /// - virt_lines_above: place virtual lines above instead. -/// - virt_lines_leftcol: Place extmarks in the leftmost +/// - virt_lines_leftcol: Place virtual lines in the leftmost /// column of the window, bypassing /// sign and number columns. /// diff --git a/test/functional/editor/defaults_spec.lua b/test/functional/editor/defaults_spec.lua index 25332d5b1f..876810ce6f 100644 --- a/test/functional/editor/defaults_spec.lua +++ b/test/functional/editor/defaults_spec.lua @@ -167,7 +167,7 @@ describe('default', function() end) describe('unimpaired-style mappings', function() - it('show the command ouptut when successful', function() + it('show the command output when successful', function() n.clear({ args_rm = { '--cmd' } }) local screen = Screen.new(40, 8) n.fn.setqflist({ diff --git a/test/old/testdir/setup.vim b/test/old/testdir/setup.vim index 9bb2dd4e0a..87287a57ff 100644 --- a/test/old/testdir/setup.vim +++ b/test/old/testdir/setup.vim @@ -3,8 +3,8 @@ if exists('s:did_load') set commentstring=/*\ %s\ */ set complete=.,w,b,u,t,i set define=^\\s*#\\s*define - set directory^=. set diffopt=internal,filler,closeoff + set directory^=. set display= set fillchars=vert:\|,foldsep:\|,fold:- set formatoptions=tcq |