diff options
| -rw-r--r-- | MAINTAIN.md | 2 | ||||
| -rw-r--r-- | cmake/Util.cmake | 4 | ||||
| -rw-r--r-- | runtime/doc/builtin.txt | 10 | ||||
| -rw-r--r-- | runtime/doc/sign.txt | 6 | ||||
| -rw-r--r-- | src/nvim/decoration.c | 2 | ||||
| -rw-r--r-- | src/nvim/eval/funcs.c | 2 | ||||
| -rw-r--r-- | src/nvim/lua/executor.c | 2 | ||||
| -rw-r--r-- | src/nvim/marktree.h | 2 |
8 files changed, 15 insertions, 15 deletions
diff --git a/MAINTAIN.md b/MAINTAIN.md index 955f736205..ff5f3fe5a1 100644 --- a/MAINTAIN.md +++ b/MAINTAIN.md @@ -113,7 +113,7 @@ should be stated explicitly and publicly. Third-party dependencies ------------------------ -These "bundled" dependencies can be updated by bumping their versions in `cmake.deps/CMakeLists.txt`. +These "bundled" dependencies can be updated by bumping their versions in `cmake.deps/deps.txt`. Some can be auto-bumped by `scripts/bump_deps.lua`. * [LuaJIT](https://github.com/LuaJIT/LuaJIT) diff --git a/cmake/Util.cmake b/cmake/Util.cmake index 0d6fa2a4ce..01d34d6752 100644 --- a/cmake/Util.cmake +++ b/cmake/Util.cmake @@ -162,8 +162,8 @@ endfunction() # cmake -B build # cmake --build build --config Release # -# Passing CMAKE_BUILD_TYPE for multi-config generators will now not only -# not be used, but also generate a warning for the user. +# Passing CMAKE_BUILD_TYPE for multi-config generators will not only not be +# used, but also generate a warning for the user. function(set_default_buildtype) set(allowableBuildTypes Debug Release MinSizeRel RelWithDebInfo) diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt index 5d70c42157..860372767a 100644 --- a/runtime/doc/builtin.txt +++ b/runtime/doc/builtin.txt @@ -6998,11 +6998,11 @@ sign_place({id}, {group}, {name}, {buf} [, {dict}]) *sign_place()* similar to the |:sign-place| command. If the sign identifier {id} is zero, then a new identifier is - allocated (first available id in a buffer). Otherwise the - specified number is used. {group} is the sign group name. To use - the global sign group, use an empty string. {group} functions - as a namespace for {id}, thus two groups can use the same IDs. - Refer to |sign-identifier| and |sign-group| for more information. + allocated. Otherwise the specified number is used. {group} is + the sign group name. To use the global sign group, use an + empty string. {group} functions as a namespace for {id}, thus + two groups can use the same IDs. Refer to |sign-identifier| + and |sign-group| for more information. {name} refers to a defined sign. {buf} refers to a buffer name or number. For the accepted diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt index 30fa7eee0b..0360ce67f6 100644 --- a/runtime/doc/sign.txt +++ b/runtime/doc/sign.txt @@ -54,9 +54,9 @@ Each placed sign is identified by a number called the sign identifier. This identifier is used to jump to the sign or to remove the sign. The identifier is assigned when placing the sign using the |:sign-place| command or the |sign_place()| function. Each sign identifier should be a unique number (per -buffer). Placing the same identifier twice will move the previously placed sign. -The |sign_place()| function can be called with a zero sign identifier to allocate -the next available identifier. +buffer). Placing the same identifier twice will move the previously placed +sign. The |sign_place()| function can be called with a zero sign identifier to +allocate the next available identifier. *sign-group* Each placed sign can be assigned to either the global group or a named group. diff --git a/src/nvim/decoration.c b/src/nvim/decoration.c index f860b65c93..e0fde50d8d 100644 --- a/src/nvim/decoration.c +++ b/src/nvim/decoration.c @@ -27,7 +27,7 @@ #endif // TODO(bfredl): These should maybe be per-buffer, so that all resources -// asssociated with a buffer can be freed when the buffer is unloaded. +// associated with a buffer can be freed when the buffer is unloaded. kvec_t(DecorSignHighlight) decor_items = KV_INITIAL_VALUE; uint32_t decor_freelist = UINT32_MAX; diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index fca1534dfc..98deb7b32b 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -7440,7 +7440,7 @@ static void f_setenv(typval_T *argvars, typval_T *rettv, EvalFuncData fptr) char valbuf[NUMBUFLEN]; const char *name = tv_get_string_buf(&argvars[0], namebuf); - // seting an environment variable may be dangerous, e.g. you could + // setting an environment variable may be dangerous, e.g. you could // setenv GCONV_PATH=/tmp and then have iconv() unexpectedly call // a shell command using some shared library: if (check_secure()) { diff --git a/src/nvim/lua/executor.c b/src/nvim/lua/executor.c index 04eda99d17..9ff217af84 100644 --- a/src/nvim/lua/executor.c +++ b/src/nvim/lua/executor.c @@ -115,7 +115,7 @@ lua_State *get_global_lstate(void) /// Convert lua error into a Vim error message /// /// @param lstate Lua interpreter state. -/// @param[in] msg Message base, must contain one `%s`. +/// @param[in] msg Message base, must contain one `%*s`. void nlua_error(lua_State *const lstate, const char *const msg) FUNC_ATTR_NONNULL_ALL { diff --git a/src/nvim/marktree.h b/src/nvim/marktree.h index bf653ee564..9fb83b8b98 100644 --- a/src/nvim/marktree.h +++ b/src/nvim/marktree.h @@ -48,7 +48,7 @@ typedef struct { } MarkTreeIter; #define marktree_itr_valid(itr) ((itr)->x != NULL) -// accces raw key: flags in MT_FLAG_EXTERNAL_MASK and decor_data are safe to modify. +// access raw key: flags in MT_FLAG_EXTERNAL_MASK and decor_data are safe to modify. #define mt_itr_rawkey(itr) ((itr)->x->key[(itr)->i]) // Internal storage |