diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2021-04-17 08:58:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-17 08:58:00 +0200 |
| commit | 7de75f0993e804811fd8059fb945c93512461ede (patch) | |
| tree | 1ac21ed858c1096837ab7a9dea5cca3bd7be4259 /src | |
| parent | a6504ec3398af114585db1d1134335d838bdb8d9 (diff) | |
| parent | 5a36d413fbc6b34ea66df27b90ebd2f725475a77 (diff) | |
| download | rneovim-7de75f0993e804811fd8059fb945c93512461ede.tar.gz rneovim-7de75f0993e804811fd8059fb945c93512461ede.tar.bz2 rneovim-7de75f0993e804811fd8059fb945c93512461ede.zip | |
Merge pull request #14365 from chentau/extmark_delbytes_move
Extmarks: flush curbuf->deleted_bytes2 after calling do_move
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_cmds.c | 11 | ||||
| -rw-r--r-- | src/nvim/extmark.c | 1 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index b191e8cf67..3e330b88a2 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -968,12 +968,6 @@ int do_move(linenr_T line1, linenr_T line2, linenr_T dest) mark_adjust_nofold(last_line - num_lines + 1, last_line, -(last_line - dest - extra), 0L, kExtmarkNOOP); - // extmarks are handled separately - extmark_move_region(curbuf, line1-1, 0, start_byte, - line2-line1+1, 0, extent_byte, - dest+line_off, 0, dest_byte+byte_off, - kExtmarkUndo); - changed_lines(last_line - num_lines + 1, 0, last_line + 1, -extra, false); // send update regarding the new lines that were added @@ -995,6 +989,11 @@ int do_move(linenr_T line1, linenr_T line2, linenr_T dest) smsg(_("%" PRId64 " lines moved"), (int64_t)num_lines); } + extmark_move_region(curbuf, line1-1, 0, start_byte, + line2-line1+1, 0, extent_byte, + dest+line_off, 0, dest_byte+byte_off, + kExtmarkUndo); + /* * Leave the cursor on the last of the moved lines. */ diff --git a/src/nvim/extmark.c b/src/nvim/extmark.c index cacbeddb32..2906a2196b 100644 --- a/src/nvim/extmark.c +++ b/src/nvim/extmark.c @@ -702,6 +702,7 @@ void extmark_move_region( int new_row, colnr_T new_col, bcount_t new_byte, ExtmarkOp undo) { + curbuf->deleted_bytes2 = 0; // TODO(bfredl): this is not synced to the buffer state inside the callback. // But unless we make the undo implementation smarter, this is not ensured // anyway. |