diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-12-07 12:04:02 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-07 12:04:02 +0800 |
| commit | 1dba570e63edcc69d6661bdcb9857def8bb18039 (patch) | |
| tree | e259baf3c0e73c05e4820d0ae0aeadc3da4e670b /src | |
| parent | a4047e0b8063ddc8da11bb89d3aba9cf614dbaa8 (diff) | |
| download | rneovim-1dba570e63edcc69d6661bdcb9857def8bb18039.tar.gz rneovim-1dba570e63edcc69d6661bdcb9857def8bb18039.tar.bz2 rneovim-1dba570e63edcc69d6661bdcb9857def8bb18039.zip | |
fix(inccommand): save and restore '[ and '] marks (#26442)
Undoing a change moves '[ and '] marks, so it is necessary to save and
restore them.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_getln.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index f31f8fec55..14d230331a 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -152,6 +152,8 @@ typedef struct cmdpreview_buf_info { buf_T *buf; OptInt save_b_p_ul; int save_b_changed; + pos_T save_b_op_start; + pos_T save_b_op_end; varnumber_T save_changedtick; CpUndoInfo undo_info; } CpBufInfo; @@ -2360,6 +2362,8 @@ static void cmdpreview_prepare(CpInfo *cpinfo) cp_bufinfo.buf = buf; cp_bufinfo.save_b_p_ul = buf->b_p_ul; cp_bufinfo.save_b_changed = buf->b_changed; + cp_bufinfo.save_b_op_start = buf->b_op_start; + cp_bufinfo.save_b_op_end = buf->b_op_end; cp_bufinfo.save_changedtick = buf_get_changedtick(buf); cmdpreview_save_undo(&cp_bufinfo.undo_info, buf); kv_push(cpinfo->buf_info, cp_bufinfo); @@ -2438,6 +2442,9 @@ static void cmdpreview_restore_state(CpInfo *cpinfo) u_blockfree(buf); cmdpreview_restore_undo(&cp_bufinfo.undo_info, buf); + buf->b_op_start = cp_bufinfo.save_b_op_start; + buf->b_op_end = cp_bufinfo.save_b_op_end; + if (cp_bufinfo.save_changedtick != buf_get_changedtick(buf)) { buf_set_changedtick(buf, cp_bufinfo.save_changedtick); } |