diff options
| -rw-r--r-- | .github/workflows/api-docs.yml | 4 | ||||
| -rwxr-xr-x | ci/snap/deploy.sh | 4 | ||||
| -rw-r--r-- | runtime/autoload/health.vim | 2 | ||||
| -rw-r--r-- | runtime/autoload/health/provider.vim | 2 | ||||
| -rw-r--r-- | runtime/doc/api.txt | 12 | ||||
| -rw-r--r-- | runtime/doc/message.txt | 2 | ||||
| -rw-r--r-- | src/nvim/ui_client.c | 2 | ||||
| -rw-r--r-- | test/functional/plugin/matchparen_spec.lua | 2 | ||||
| -rw-r--r-- | test/functional/ui/fold_spec.lua | 2 |
9 files changed, 16 insertions, 16 deletions
diff --git a/.github/workflows/api-docs.yml b/.github/workflows/api-docs.yml index 561524f64a..2e22a1200f 100644 --- a/.github/workflows/api-docs.yml +++ b/.github/workflows/api-docs.yml @@ -1,5 +1,5 @@ # Autogenerate the API docs on new commit to important branches -# Also work as a check for PR's to not forget commiting their doc changes +# Also work as a check for PR's to not forget committing their doc changes # called from api-docs-check.yml name: Autogenerate API docs on: @@ -52,7 +52,7 @@ jobs: python3 scripts/gen_vimdoc.py printf '::set-output name=UPDATED_DOCS::%s\n' $([ -z "$(git diff)" ]; echo $?) - - name: FAIL, PR has not commited doc changes + - name: FAIL, PR has not committed doc changes if: ${{ steps.docs.outputs.UPDATED_DOCS != 0 && inputs.check_only }} run: | echo "Job failed, run ./scripts/gen_vimdoc.py and commit your doc changes" diff --git a/ci/snap/deploy.sh b/ci/snap/deploy.sh index 8429059e22..1794fc61d9 100755 --- a/ci/snap/deploy.sh +++ b/ci/snap/deploy.sh @@ -8,7 +8,7 @@ WEBHOOK_PAYLOAD="$(cat "${SNAP_DIR}/.snapcraft_payload")" PAYLOAD_SIG="${SECRET_SNAP_SIG}" -snap_realease_needed() { +snap_release_needed() { last_committed_tag="$(git tag -l --sort=refname|head -1)" last_snap_release="$(snap info nvim | awk '$1 == "latest/edge:" { print $2 }' | perl -lpe 's/v\d.\d.\d-//g')" git fetch -f --tags @@ -33,7 +33,7 @@ trigger_snapcraft_webhook() { } -if $(snap_realease_needed); then +if $(snap_release_needed); then echo "New snap release required" trigger_snapcraft_webhook fi diff --git a/runtime/autoload/health.vim b/runtime/autoload/health.vim index ec030adf04..1292e4344e 100644 --- a/runtime/autoload/health.vim +++ b/runtime/autoload/health.vim @@ -188,7 +188,7 @@ function! s:get_healthcheck_list(plugin_names) abort \ + nvim_get_runtime_file('lua/**/'.p.'/health/init.lua', v:true) \ + nvim_get_runtime_file('lua/**/'.p.'/health.lua', v:true) if len(paths) == 0 - let healthchecks += [[p, '', '']] " healthchek not found + let healthchecks += [[p, '', '']] " healthcheck not found else let healthchecks += map(uniq(sort(paths)), \'<SID>filepath_to_healthcheck(v:val)') diff --git a/runtime/autoload/health/provider.vim b/runtime/autoload/health/provider.vim index 6022e05c22..a01cb9631c 100644 --- a/runtime/autoload/health/provider.vim +++ b/runtime/autoload/health/provider.vim @@ -690,7 +690,7 @@ function! s:check_perl() abort if empty(perl_exec) if !empty(perl_warnings) call health#report_warn(perl_warnings, ['See :help provider-perl for more information.', - \ 'You may disable this provider (and warning) by adding `let g:loaded_node_provider = 0` to your init.vim']) + \ 'You may disable this provider (and warning) by adding `let g:loaded_perl_provider = 0` to your init.vim']) else call health#report_warn('No usable perl executable found') endif diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt index 13179e9d9e..d912b22197 100644 --- a/runtime/doc/api.txt +++ b/runtime/doc/api.txt @@ -452,7 +452,7 @@ Extended marks (extmarks) represent buffer annotations that track text changes in the buffer. They can represent cursors, folds, misspelled words, anything that needs to track a logical location in the buffer over time. |api-indexing| -Extmark position works like "bar" cursor: it exists between characters. Thus +Extmark position works like "bar" cursor: it exists between characters. Thus, the maximum extmark index on a line is 1 more than the character index: > f o o b a r line contents @@ -468,7 +468,7 @@ extmark position and enter some text, the extmark migrates forward. > f o o z|b a r line (| = cursor) 4 extmark (after typing "z") -If an extmark is on the last index of a line and you inputs a newline at that +If an extmark is on the last index of a line and you input a newline at that point, the extmark will accordingly migrate to the next line: > f o o z b a r| line (| = cursor) @@ -1802,7 +1802,7 @@ nvim_parse_expression({expr}, {flags}, {highlight}) there for debugging purposes primary (debugging parser and providing debug information). • "children": a list of nodes described in top/"ast". - There always is zero, one or two children, key will + There is always zero, one or two children, key will not be present if node has no children. Maximum number of children may be found in node_maxchildren array. @@ -1967,7 +1967,7 @@ nvim_buf_call({buffer}, {fun}) *nvim_buf_call()* current window already shows "buffer", the window is not switched If a window inside the current tabpage (including a float) already shows the buffer One of these windows will be - set as current window temporarily. Otherwise a temporary + set as current window temporarily. Otherwise, a temporary scratch window (called the "autocmd window" for historical reasons) will be used. @@ -2362,7 +2362,7 @@ nvim_buf_add_highlight({buffer}, {ns_id}, {hl_group}, {line}, {col_start}, it in to this function as `ns_id` to add highlights to the namespace. All highlights in the same namespace can then be cleared with single call to |nvim_buf_clear_namespace()|. If - the highlight never will be deleted by an API call, pass + the highlight will never be deleted by an API call, pass `ns_id = -1`. As a shorthand, `ns_id = 0` can be used to create a new @@ -3029,7 +3029,7 @@ nvim_open_win({buffer}, {enter}, {*config}) *nvim_open_win()* double box style could be specified as [ "╔", "═" ,"╗", "║", "╝", "═", "╚", "║" ]. If the number of chars are less than eight, - they will be repeated. Thus an ASCII border + they will be repeated. Thus, an ASCII border could be specified as [ "/", "-", "\\", "|" ], or all chars the same as [ "x" ]. An empty string can be used to turn off a diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt index fa1bc6f7da..dac4df5ee9 100644 --- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -61,7 +61,7 @@ If you are lazy, it also works without the shift key: > When an error message is displayed, but it is removed before you could read it, you can see it again with: > - :echo errmsg + :echo v:errmsg Or view a list of recent messages with: > :messages See `:messages` above. diff --git a/src/nvim/ui_client.c b/src/nvim/ui_client.c index e723a30d32..49971ac501 100644 --- a/src/nvim/ui_client.c +++ b/src/nvim/ui_client.c @@ -152,7 +152,7 @@ void ui_client_event_grid_line(Array args) Array cells = args.items[3].data.array; Integer endcol, clearcol; - // TODO(hlpr98): Accomodate other LineFlags when included in grid_line + // TODO(hlpr98): Accommodate other LineFlags when included in grid_line LineFlags lineflags = 0; endcol = startcol; diff --git a/test/functional/plugin/matchparen_spec.lua b/test/functional/plugin/matchparen_spec.lua index 13e1283e2c..2670734c1a 100644 --- a/test/functional/plugin/matchparen_spec.lua +++ b/test/functional/plugin/matchparen_spec.lua @@ -27,7 +27,7 @@ describe('matchparen', function() feed('{<cr>') feed('}') - -- critical part: up + cr should result in an empty line inbetween the + -- critical part: up + cr should result in an empty line in between the -- brackets... if the bug is there, the empty line will be before the '{' feed('<up>') feed('<cr>') diff --git a/test/functional/ui/fold_spec.lua b/test/functional/ui/fold_spec.lua index 3e0e15c2b7..bc52696418 100644 --- a/test/functional/ui/fold_spec.lua +++ b/test/functional/ui/fold_spec.lua @@ -1672,7 +1672,7 @@ describe("folded lines", function() end -- relax the maximum fdc thus fdc should expand to - -- accomodate the current number of folds + -- accommodate the current number of folds command("set foldcolumn=auto:4") if multigrid then screen:expect([[ |