aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBjörn Linse <bjorn.linse@gmail.com>2021-05-10 23:18:14 +0200
committerGitHub <noreply@github.com>2021-05-10 23:18:14 +0200
commit133351cbf80d620513eb6eb1b63eae15312eaeed (patch)
tree6d802166ca54239e24568224994e8bfbcda47b5f /src
parent7b0edaac56c7649a104de01ac25f7bd97d408fea (diff)
parent81dc64796106e61f197822f9b8d2f2ae37174559 (diff)
downloadrneovim-133351cbf80d620513eb6eb1b63eae15312eaeed.tar.gz
rneovim-133351cbf80d620513eb6eb1b63eae15312eaeed.tar.bz2
rneovim-133351cbf80d620513eb6eb1b63eae15312eaeed.zip
Merge pull request #14528 from disrupted/fix/nvim_buf_set_lines
Fix nvim_buf_set_lines
Diffstat (limited to 'src')
-rw-r--r--src/nvim/api/buffer.c2
-rw-r--r--src/nvim/ops.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c
index 665c622c98..ebc9aeb75f 100644
--- a/src/nvim/api/buffer.c
+++ b/src/nvim/api/buffer.c
@@ -516,7 +516,7 @@ void nvim_buf_set_lines(uint64_t channel_id,
kExtmarkNOOP);
extmark_splice(curbuf, (int)start-1, 0, (int)(end-start), 0,
- deleted_bytes, (int)(end+extra-1), 0, inserted_bytes,
+ deleted_bytes, (int)new_len, 0, inserted_bytes,
kExtmarkUndo);
changed_lines((linenr_T)start, 0, (linenr_T)end, (long)extra, true);
diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index ca68ef04b0..0ed116c17f 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -6307,7 +6307,7 @@ bcount_t get_region_bytecount(buf_T *buf, linenr_T start_lnum,
linenr_T end_lnum, colnr_T start_col,
colnr_T end_col)
{
- linenr_T max_lnum = buf->b_ml.ml_line_lnum;
+ linenr_T max_lnum = buf->b_ml.ml_line_count;
if (start_lnum > max_lnum) {
return 0;
}