From ba515622fb84e6c570e12743630e75acf5f83839 Mon Sep 17 00:00:00 2001
From: KillTheMule <KillTheMule@users.noreply.github.com>
Date: Sat, 8 Aug 2020 15:33:41 +0200
Subject: Fix buffer_updates on blockwise paste

Fixes #12718.
---
 src/nvim/ops.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index d1f2e9e4f1..6459dbfe6e 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -3201,7 +3201,8 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
         curwin->w_cursor.col += bd.startspaces;
     }
 
-    changed_lines(lnum, 0, curwin->w_cursor.lnum, nr_lines, true);
+    changed_lines(lnum, 0, curbuf->b_op_start.lnum + (linenr_T)y_size
+                  - (linenr_T)nr_lines , nr_lines, true);
 
     /* Set '[ mark. */
     curbuf->b_op_start = curwin->w_cursor;
-- 
cgit 


From 02dcc3c11ad72e0ae3c6704af6b08d9275ed5470 Mon Sep 17 00:00:00 2001
From: KillTheMule <KillTheMule@users.noreply.github.com>
Date: Wed, 30 Sep 2020 21:28:21 +0200
Subject: Fix byte updates for blockwise paste at buffer end

---
 src/nvim/ops.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index 6459dbfe6e..8329daf5f1 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -3109,6 +3109,9 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
     for (i = 0; i < y_size; i++) {
       int spaces;
       char shortline;
+      // can just be 0 or 1, needed for blockwise paste beyond the current
+      // buffer end
+      int lines_appended = 0;
 
       bd.startspaces = 0;
       bd.endspaces = 0;
@@ -3122,6 +3125,7 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
           break;
         }
         nr_lines++;
+        lines_appended = 1;
       }
       /* get the old line and advance to the position to insert at */
       oldp = get_cursor_line_ptr();
@@ -3194,7 +3198,7 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
       memmove(ptr, oldp + bd.textcol + delcount, (size_t)columns);
       ml_replace(curwin->w_cursor.lnum, newp, false);
       extmark_splice_cols(curbuf, (int)curwin->w_cursor.lnum-1, bd.textcol,
-                          delcount, (int)totlen, kExtmarkUndo);
+                          delcount, (int)totlen + lines_appended, kExtmarkUndo);
 
       ++curwin->w_cursor.lnum;
       if (i == 0)
-- 
cgit