mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-07-20 16:11:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #37068 from janlazo/vim-9.0.0154

Browse Source 
vim-patch:9.0.{154,1899}
This commit is contained in:
zeertzjq
2025-12-22 14:14:21 +08:00
committed by GitHub
parent b95848a8f1 1afdcb8f2b
commit 2b766e1f4d
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/nvim/ops.c
View File

@@ -1046,11 +1046,20 @@ static void mb_adjust_opend(oparg_T *oap)
}
}
/// Put character 'c' at position 'lp'
static inline void pbyte(pos_T lp, int c)
/// put byte 'c' at position 'lp', but
/// verify, that the position to place
/// is actually safe
static void pbyte(pos_T lp, int c)
{
assert(c <= UCHAR_MAX);
*(ml_get_buf_mut(curbuf, lp.lnum) + lp.col) = (char)c;
char *p = ml_get_buf_mut(curbuf, lp.lnum);
colnr_T len = curbuf->b_ml.ml_line_len;
// safety check
if (lp.col >= len) {
lp.col = (len > 1 ? len - 2 : 0);
}
*(p + lp.col) = (char)c;
if (!curbuf_splice_pending) {
extmark_splice_cols(curbuf, (int)lp.lnum - 1, lp.col, 1, 1, kExtmarkUndo);
}
@@ -1865,7 +1874,7 @@ char *skip_comment(char *line, bool process, bool include_space, bool *is_commen
return line;
}
/// @param count number of lines (minimal 2) to join at cursor position.
/// @param count number of lines (minimal 2) to join at the cursor position.
/// @param save_undo when true, save lines for undo first.
/// @param use_formatoptions set to false when e.g. processing backspace and comment
/// leaders should not be removed.