aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/api-docs.yml2
-rw-r--r--.github/workflows/vim-patches.yml2
-rw-r--r--cmake.deps/CMakeLists.txt2
-rw-r--r--cmake/FindLibIntl.cmake2
-rw-r--r--runtime/doc/eval.txt4
-rw-r--r--runtime/doc/intro.txt2
-rw-r--r--runtime/doc/tagsrch.txt2
-rwxr-xr-xsrc/nvim/CMakeLists.txt2
-rw-r--r--src/nvim/api/ui.c2
-rw-r--r--src/nvim/edit.c2
-rw-r--r--src/nvim/garray.h2
-rw-r--r--src/nvim/main.c2
12 files changed, 13 insertions, 13 deletions
diff --git a/.github/workflows/api-docs.yml b/.github/workflows/api-docs.yml
index fa8a7dbca0..af0397c7cb 100644
--- a/.github/workflows/api-docs.yml
+++ b/.github/workflows/api-docs.yml
@@ -44,7 +44,7 @@ jobs:
sudo apt-get update
sudo env DEBIAN_FRONTEND=noninteractive apt-get install -y doxygen python3 python3-msgpack
- - name: Setup git config
+ - name: Set up git config
run: |
git config --global user.name 'marvim'
git config --global user.email 'marvim@users.noreply.github.com'
diff --git a/.github/workflows/vim-patches.yml b/.github/workflows/vim-patches.yml
index 305f8019f1..60a5775497 100644
--- a/.github/workflows/vim-patches.yml
+++ b/.github/workflows/vim-patches.yml
@@ -34,7 +34,7 @@ jobs:
mv nvim.appimage $HOME/.local/bin/nvim
printf '%s\n' "$HOME/.local/bin" >> $GITHUB_PATH
- - name: Setup git config
+ - name: Set up git config
run: |
git config --global user.name 'marvim'
git config --global user.email 'marvim@users.noreply.github.com'
diff --git a/cmake.deps/CMakeLists.txt b/cmake.deps/CMakeLists.txt
index d255c1fd9d..271908259f 100644
--- a/cmake.deps/CMakeLists.txt
+++ b/cmake.deps/CMakeLists.txt
@@ -62,7 +62,7 @@ option(USE_BUNDLED_MSGPACK "Use the bundled msgpack." ${USE_BUNDLED})
option(USE_BUNDLED_LUAJIT "Use the bundled version of luajit." ${USE_BUNDLED})
option(USE_BUNDLED_LUAROCKS "Use the bundled version of luarocks." ${USE_BUNDLED})
option(USE_BUNDLED_LUV "Use the bundled version of luv." ${USE_BUNDLED})
-#XXX(tarruda): Lua is only used for debugging the functional test client, no
+#XXX(tarruda): Lua is only used for debugging the functional test client, don't
# build it unless explicitly requested
option(USE_BUNDLED_LUA "Use the bundled version of lua." OFF)
option(USE_BUNDLED_TS_PARSERS "Use the bundled treesitter parsers." ${USE_BUNDLED})
diff --git a/cmake/FindLibIntl.cmake b/cmake/FindLibIntl.cmake
index 8cc5cb7dd2..d78b39ab40 100644
--- a/cmake/FindLibIntl.cmake
+++ b/cmake/FindLibIntl.cmake
@@ -10,7 +10,7 @@ include(CheckVariableExists)
include(LibFindMacros)
# Append custom gettext path to CMAKE_PREFIX_PATH
-# if installed via Mac Hombrew
+# if installed via Mac Homebrew
if (CMAKE_HOST_APPLE)
find_program(HOMEBREW_PROG brew)
if (EXISTS ${HOMEBREW_PROG})
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 0e77fb182e..3889b8e9a5 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1827,8 +1827,8 @@ v:event Dictionary of event data for the current |autocommand|. Valid
|CompleteChanged|.
scrollbar Is |v:true| if popup menu have scrollbar, or
|v:false| if not.
- changed_window Is |v:true| if the the event fired
- while changing window (or tab) on |DirChanged|.
+ changed_window Is |v:true| if the event fired while
+ changing window (or tab) on |DirChanged|.
status Job status or exit code, -1 means "unknown". |TermClose|
*v:exception* *exception-variable*
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index 6bf6850ccf..11ba1b408c 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -382,7 +382,7 @@ Note:
- If numlock is on the |TUI| receives plain ASCII values, so mapping <k0>,
<k1>, ..., <k9> and <kPoint> will not work.
- Nvim supports mapping multibyte chars with modifiers such as `<M-รค>`. Which
- combinations actually work depends on the the UI or host terminal.
+ combinations actually work depends on the UI or host terminal.
- When a key is pressed using a meta or alt modifier and no mapping exists for
that keypress, Nvim may behave as though <Esc> was pressed before the key.
- It is possible to notate combined modifiers (e.g. <C-A-T> for CTRL-ALT-T),
diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt
index 0f785dd1eb..49e51d6736 100644
--- a/runtime/doc/tagsrch.txt
+++ b/runtime/doc/tagsrch.txt
@@ -92,7 +92,7 @@ The ignore-case matches are found when:
- when 'tagcase' is "followscs" and 'ignorecase' is on or the 'smartcase'
option is on and the pattern does not contain an upper case character
- when 'tagcase' is "ignore"
-- when 'tagcase' is "smart" and the patter does not contain an upper case
+- when 'tagcase' is "smart" and the pattern does not contain an upper case
character
Note that using ignore-case tag searching disables binary searching in the
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 7d75b8038e..329e831b2e 100755
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -6,7 +6,7 @@ find_package(libuv CONFIG)
if(TARGET libuv::uv_a)
target_link_libraries(libuv_lib INTERFACE libuv::uv_a)
else()
- # Fallback to find module for older libuv versions, that don't provide the cmake package
+ # Fall back to find module for older libuv versions that don't provide config file
find_package(LibUV 1.28.0 REQUIRED MODULE)
target_include_directories(libuv_lib SYSTEM BEFORE INTERFACE ${LIBUV_INCLUDE_DIRS})
target_link_libraries(libuv_lib INTERFACE ${LIBUV_LIBRARIES})
diff --git a/src/nvim/api/ui.c b/src/nvim/api/ui.c
index 61f2c881b3..3c3c3008f4 100644
--- a/src/nvim/api/ui.c
+++ b/src/nvim/api/ui.c
@@ -254,7 +254,7 @@ void nvim_ui_detach(uint64_t channel_id, Error *err)
remote_ui_disconnect(channel_id);
}
-// TODO(bfredl): use me to detach a specifc ui from the server
+// TODO(bfredl): use me to detach a specific ui from the server
void remote_ui_stop(UI *ui)
{}
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index ff7899d0eb..8b74593360 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -2791,7 +2791,7 @@ static char_u *replace_stack = NULL;
static ssize_t replace_stack_nr = 0; // next entry in replace stack
static ssize_t replace_stack_len = 0; // max. number of entries
-/// Push character that is replaced onto the the replace stack.
+/// Push character that is replaced onto the replace stack.
///
/// replace_offset is normally 0, in which case replace_push will add a new
/// character at the end of the stack. If replace_offset is not 0, that many
diff --git a/src/nvim/garray.h b/src/nvim/garray.h
index 1623c4db7b..d3e04cd761 100644
--- a/src/nvim/garray.h
+++ b/src/nvim/garray.h
@@ -52,7 +52,7 @@ static inline void *ga_append_via_ptr(garray_T *gap, size_t item_size)
///
/// @param gap the garray to be freed
/// @param item_type type of the item in the garray
-/// @param free_item_fn free function that takes (*item_type) as parameter
+/// @param free_item_fn free function that takes (item_type *) as parameter
#define GA_DEEP_CLEAR(gap, item_type, free_item_fn) \
do { \
garray_T *_gap = (gap); \
diff --git a/src/nvim/main.c b/src/nvim/main.c
index f2aa14e04c..0ecb5f742d 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -182,7 +182,7 @@ void early_init(mparm_T *paramp)
#ifdef MSWIN
OSVERSIONINFO ovi;
ovi.dwOSVersionInfoSize = sizeof(ovi);
- // Disable warning about GetVersionExA being deprecated. There doesn't seem to be a conventient
+ // Disable warning about GetVersionExA being deprecated. There doesn't seem to be a convenient
// replacement that doesn't add a ton of extra code as of writing this.
# pragma warning(suppress : 4996)
GetVersionEx(&ovi);
generated by cgit (git 2.34.1) at 2025-04-28 22:13:57 +0000