diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/README.md | 3 | ||||
| -rw-r--r-- | src/nvim/autocmd.c | 2 | ||||
| -rw-r--r-- | src/nvim/eval.lua | 2 | ||||
| -rw-r--r-- | src/nvim/eval/funcs.c | 2 | ||||
| -rw-r--r-- | src/nvim/eval/vars.c | 2 | ||||
| -rw-r--r-- | src/nvim/grid_defs.h | 2 | ||||
| -rw-r--r-- | src/nvim/options.lua | 6 |
7 files changed, 9 insertions, 10 deletions
diff --git a/src/nvim/README.md b/src/nvim/README.md index 0de0fb9a3f..4029777031 100644 --- a/src/nvim/README.md +++ b/src/nvim/README.md @@ -1,8 +1,7 @@ Nvim core ========= -Module-specific details are documented at the top of each module (`terminal.c`, -`screen.c`, …). +Module-specific details are documented at the top of each module (`terminal.c`, `undo.c`, …). See `:help dev` for guidelines. diff --git a/src/nvim/autocmd.c b/src/nvim/autocmd.c index 5f94fbb014..3fa20f4e48 100644 --- a/src/nvim/autocmd.c +++ b/src/nvim/autocmd.c @@ -2524,7 +2524,7 @@ static bool arg_autocmd_flag_get(bool *flag, char **cmd_ptr, char *pattern, int } /// When kFalse: VimSuspend should be triggered next. -/// When kTrue: VimResume should be triggerd next. +/// When kTrue: VimResume should be triggered next. /// When kNone: Currently triggering VimSuspend or VimResume. static TriState pending_vimresume = kFalse; diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua index a9200d1f5f..e6efbe85d8 100644 --- a/src/nvim/eval.lua +++ b/src/nvim/eval.lua @@ -7472,7 +7472,7 @@ M.funcs = { *printf-$* In certain languages, error and informative messages are more readable when the order of words is different from the - corresponding message in English. To accomodate translations + corresponding message in English. To accommodate translations having a different word order, positional arguments may be used to indicate this. For instance: >vim diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 1ed0994222..93075cf0e2 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -6329,7 +6329,7 @@ static void reduce_string(typval_T *argvars, typval_T *expr, typval_T *rettv) } } -/// Implementaion of reduce() for Blob "argvars[0]" using the function "expr" +/// Implementation of reduce() for Blob "argvars[0]" using the function "expr" /// starting with the optional initial value "argvars[2]" and return the result /// in "rettv". static void reduce_blob(typval_T *argvars, typval_T *expr, typval_T *rettv) diff --git a/src/nvim/eval/vars.c b/src/nvim/eval/vars.c index 9b6427fef7..e5b1b88eef 100644 --- a/src/nvim/eval/vars.c +++ b/src/nvim/eval/vars.c @@ -1810,7 +1810,7 @@ static void getwinvar(typval_T *argvars, typval_T *rettv, int off) /// @param[in] tv typval to convert. /// @param[in] option Option name. /// @param[in] flags Option flags. -/// @param[out] error Whether an error occured. +/// @param[out] error Whether an error occurred. /// /// @return Typval converted to OptVal. Must be freed by caller. /// Returns NIL_OPTVAL for invalid option name. diff --git a/src/nvim/grid_defs.h b/src/nvim/grid_defs.h index aeaadea73c..4ad7d4cdb4 100644 --- a/src/nvim/grid_defs.h +++ b/src/nvim/grid_defs.h @@ -39,7 +39,7 @@ enum { /// /// attrs[] contains the highlighting attribute for each cell. /// -/// vcols[] countain the virtual columns in the line. -1 means not available +/// vcols[] contains the virtual columns in the line. -1 means not available /// (below last line), MAXCOL means after the end of the line. /// /// line_offset[n] is the offset from chars[], attrs[] and vcols[] for the start diff --git a/src/nvim/options.lua b/src/nvim/options.lua index b774df476f..f0666101b8 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -3441,10 +3441,10 @@ return { n-v-c-sm:block,i-ci-ve:ver25-Cursor,r-cr-o:hor20 In Normal et al. modes, use a block cursor with the default colors defined by the host - terminal. In Insert-likes modes, use + terminal. In Insert-like modes, use a vertical bar cursor with colors from - "Cursor" highlight group. In Replace-likes - modes, use a underline cursor with + "Cursor" highlight group. In Replace-like + modes, use an underline cursor with default colors. i-ci:ver30-iCursor-blinkwait300-blinkon200-blinkoff150 In Insert and Command-line Insert mode, use a |