mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-28 05:58:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

inccommand: preserve extmarks when undoing preview substitution

Browse Source
This commit is contained in:
Björn Linse
2021-02-04 11:20:54 +01:00
parent 94cf7bba00
commit aa50369897
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/ex_cmds.c
View File

@@ -3316,11 +3316,7 @@ static buf_T *do_sub(exarg_T *eap, proftime_T timeout,
int save_b_changed = curbuf->b_changed;
bool preview = (State & CMDPREVIEW);
// inccommand tests fail without this check
if (!preview) {
// Required for Undo to work for extmarks.
u_save_cursor();
}
bool did_save = false;
if (!global_busy) {
sub_nsubs = 0;
@@ -3997,6 +3993,11 @@ static buf_T *do_sub(exarg_T *eap, proftime_T timeout,
int matchcols = end.col - ((end.lnum == start.lnum)
? start.col : 0);
int subcols = new_endcol - ((lnum == lnum_start) ? start_col : 0);
if (!did_save) {
// Required for Undo to work for extmarks.
u_save_cursor();
did_save = true;
}
extmark_splice(curbuf, lnum_start-1, start_col,
end.lnum-start.lnum, matchcols, replaced_bytes,
lnum-lnum_start, subcols, sublen-1, kExtmarkUndo);