diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/shada.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/nvim/shada.c b/src/nvim/shada.c index 322f485f48..3f8dfe827d 100644 --- a/src/nvim/shada.c +++ b/src/nvim/shada.c @@ -1016,14 +1016,14 @@ static const void *shada_hist_iter(const void *const iter, /// according to the timestamp). If entry was already in the ring buffer /// existing entry will be removed unless it has greater timestamp. /// -/// Before the new entry entries from the current NeoVim history will be +/// Before the new entry entries from the current Neovim history will be /// inserted unless `do_iter` argument is false. /// /// @param[in,out] hms_p Ring buffer and associated structures. /// @param[in] entry Inserted entry. -/// @param[in] do_iter Determines whether NeoVim own history should +/// @param[in] do_iter Determines whether Neovim own history should /// be used. Must be true only if inserting -/// entry from current NeoVim history. +/// entry from current Neovim history. /// @param[in] can_free_entry True if entry can be freed. static void hms_insert(HistoryMergerState *const hms_p, const ShadaEntry entry, const bool do_iter, const bool can_free_entry) @@ -1054,7 +1054,7 @@ static void hms_insert(HistoryMergerState *const hms_p, const ShadaEntry entry, if (entry.timestamp > existing_entry->data.timestamp) { hmll_remove(hmll, existing_entry); } else if (!do_iter && entry.timestamp == existing_entry->data.timestamp) { - // Prefer entry from the current NeoVim instance. + // Prefer entry from the current Neovim instance. if (existing_entry->can_free_entry) { shada_free_shada_entry(&existing_entry->data); } @@ -1083,7 +1083,7 @@ static void hms_insert(HistoryMergerState *const hms_p, const ShadaEntry entry, /// @param[in] num_elements Number of elements in the result. /// @param[in] do_merge Prepare structure for merging elements. /// @param[in] reading If true, then merger is reading history for use -/// in NeoVim. +/// in Neovim. static inline void hms_init(HistoryMergerState *const hms_p, const uint8_t history_type, const size_t num_elements, @@ -1099,7 +1099,7 @@ static inline void hms_init(HistoryMergerState *const hms_p, hms_p->history_type = history_type; } -/// Merge in all remaining NeoVim own history entries +/// Merge in all remaining Neovim own history entries /// /// @param[in,out] hms_p Merger structure into which history should be /// inserted. @@ -1119,7 +1119,7 @@ static inline void hms_insert_whole_neovim_history( } } -/// Convert merger structure to NeoVim internal structure for history +/// Convert merger structure to Neovim internal structure for history /// /// @param[in] hms_p Converted merger structure. /// @param[out] hist_array Array with the results. @@ -1548,7 +1548,7 @@ static void shada_read(ShaDaReadDef *const sd_reader, const int flags) shada_read_main_cycle_end: // Warning: shada_hist_iter returns ShadaEntry elements which use strings from // original history list. This means that once such entry is removed - // from the history NeoVim array will no longer be valid. To reduce + // from the history Neovim array will no longer be valid. To reduce // amount of memory allocations ShaDa file reader allocates enough // memory for the history string itself and separator character which // may be assigned right away. @@ -2349,7 +2349,7 @@ static inline ShaDaWriteResult shada_read_when_writing( /// @param[in] sd_writer Structure containing file writer definition. /// @param[in] sd_reader Structure containing file reader definition. If it is /// not NULL then contents of this file will be merged -/// with current NeoVim runtime. +/// with current Neovim runtime. static ShaDaWriteResult shada_write(ShaDaWriteDef *const sd_writer, ShaDaReadDef *const sd_reader) FUNC_ATTR_NONNULL_ARG(1) @@ -3063,7 +3063,7 @@ int shada_read_marks(void) /// /// @param[in] fname File to write to. If it is NULL or empty then default /// @param[in] forceit If true, use forced reading (prioritize file contents -/// over current NeoVim state). +/// over current Neovim state). /// @param[in] missing_ok If true, do not error out when file is missing. /// /// @return OK in case of success, FAIL otherwise. |