diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/nvim/option.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index 20481153ed..8020bbd6e3 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -161,7 +161,6 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin") # https://github.com/neovim/neovim/issues/25295 target_link_options(nvim_bin PRIVATE "-Wl,-export_dynamic") # Apple Clang 16's new deduplication pass leads to lock-up on start - # TODO(clason): verify that problem remains after release or remove target_link_options(nvim_bin PRIVATE "-Wl,-no_deduplicate") elseif(CMAKE_SYSTEM_NAME MATCHES "OpenBSD") target_link_libraries(main_lib INTERFACE pthread c++abi) diff --git a/src/nvim/option.c b/src/nvim/option.c index 3a5a652dd2..aac15e220a 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -246,7 +246,7 @@ static void set_init_default_backupskip(void) // note: the value (and therefore plen) may already include a path separator size_t itemsize = plen + (has_trailing_path_sep ? 0 : 1) + 2; char *item = xmalloc(itemsize); - // add a preceeding comma as a separator after the first item + // add a preceding comma as a separator after the first item size_t itemseplen = (ga.ga_len == 0) ? 0 : 1; size_t itemlen = (size_t)vim_snprintf(item, itemsize, "%s%s*", p, |