aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBjörn Linse <bjorn.linse@gmail.com>2021-06-29 15:31:23 +0200
committerGitHub <noreply@github.com>2021-06-29 15:31:23 +0200
commitf8990870ffd86ff36cc86e23b82b74b1a764b525 (patch)
tree3f40c4cb4e02ebc2fce2fe92d7d34bbcfdb70051 /src
parentf83c25942dd8b94ad5218ce78b9e6fb86d2f0358 (diff)
parent1c962401a10911e2766a5290f9b8171558c8fb40 (diff)
downloadrneovim-f8990870ffd86ff36cc86e23b82b74b1a764b525.tar.gz
rneovim-f8990870ffd86ff36cc86e23b82b74b1a764b525.tar.bz2
rneovim-f8990870ffd86ff36cc86e23b82b74b1a764b525.zip
Merge pull request #14335 from chentau/extmark_delbytes
Extmarks: manually zero out `curbuf->deleted_bytes2` on substitute and join
Diffstat (limited to 'src')
-rw-r--r--src/nvim/ex_cmds.c2
-rw-r--r--src/nvim/ops.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index c399d47b7e..4af7794317 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -4237,6 +4237,8 @@ skip:
}
}
+ curbuf->deleted_bytes2 = 0;
+
if (first_line != 0) {
/* Need to subtract the number of added lines from "last_line" to get
* the line number before the change (same as adding the number of
diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index f2f6803665..04a8fc8499 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -3992,6 +3992,7 @@ int do_join(size_t count,
del_lines((long)count - 1, false);
curwin->w_cursor.lnum = t;
curbuf_splice_pending--;
+ curbuf->deleted_bytes2 = 0;
/*
* Set the cursor column: