4 files changed, 39 insertions, 21 deletions

diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index b355491dcc..6d6fd85266 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -1212,7 +1212,7 @@ Dictionary nvim_get_namespaces(void)
 /// Sets redo/undo. Faster than |nvim_input()|.
 ///
 /// @param data  Multiline input. May be binary (containing NUL bytes).
-/// @param phase  Pass -1 to paste as one big buffer (i.e. without streaming).
+/// @param phase  -1: paste in a single call (i.e. without streaming).
 ///               To "stream" a paste, call `nvim_paste` sequentially with
 ///               these `phase` values:
 ///                 - 1: starts the paste (exactly once)
@@ -1227,8 +1227,13 @@ Boolean nvim_paste(String data, Integer phase, Error *err)
     api_set_error(err, kErrorTypeValidation, "Invalid phase: %"PRId64, phase);
     return false;
   }
+  if (!(State & CMDLINE) && !(State & INSERT) && (phase == -1 || phase == 1)) {
+    ResetRedobuff();
+    AppendCharToRedobuff('a');  // Dot-repeat.
+  }
+  Array lines = string_to_array(data);
   Array args = ARRAY_DICT_INIT;
-  ADD(args, ARRAY_OBJ(string_to_array(data)));
+  ADD(args, ARRAY_OBJ(lines));
   ADD(args, INTEGER_OBJ(phase));
   Object rv
     = nvim_execute_lua(STATIC_CSTR_AS_STRING("return vim._paste(...)"),
@@ -1236,6 +1241,20 @@ Boolean nvim_paste(String data, Integer phase, Error *err)
   // Abort paste if handler does not return true.
   bool ok = !ERROR_SET(err)
     && (rv.type == kObjectTypeBoolean && rv.data.boolean);
+  if (ok && !(State & CMDLINE)) {  // Dot-repeat.
+    for (size_t i = 0; i < lines.size; i++) {
+      String s = lines.items[i].data.string;
+      assert(data.size <= INT_MAX);
+      AppendToRedobuffLit((char_u *)s.data, (int)s.size);
+      // readfile()-style: "\n" is indicated by presence of N+1 item.
+      if (i + 1 < lines.size) {
+        AppendCharToRedobuff(NL);
+      }
+    }
+  }
+  if (!(State & CMDLINE) && !(State & INSERT) && (phase == -1 || phase == 3)) {
+    AppendCharToRedobuff(ESC);  // Dot-repeat.
+  }
   api_free_object(rv);
   api_free_array(args);
 
diff --git a/src/nvim/lua/vim.lua b/src/nvim/lua/vim.lua
index 59438c8667..05951fbd0f 100644
--- a/src/nvim/lua/vim.lua
+++ b/src/nvim/lua/vim.lua
@@ -93,35 +93,32 @@ local function _os_proc_children(ppid)
   return children
 end
 
--- Default paste function.
+-- Default nvim_paste() handler.
 local _paste = (function()
-  local tdots = 0
-  local tredraw = 0
-  local tick = 0
+  local tdots, tredraw, tick, got_line1 = 0, 0, 0, false
   return function(lines, phase)
     local call = vim.api.nvim_call_function
     local now = vim.loop.now()
     local mode = call('mode', {}):sub(1,1)
-    if phase == 1 then
-      tdots = now
-      tredraw = now
-      tick = 0
-      -- TODO
-      -- if mode == 'i' or mode == 'R' then
-      --   nvim_cancel()
-      -- end
+    if phase < 2 then  -- Reset flags.
+      tdots, tredraw, tick, got_line1 = now, now, 0, false
     end
-    if mode == 'i' or mode == 'R' then
+    if mode == 'c' and not got_line1 then  -- cmdline-mode: paste only 1 line.
+      got_line1 = (#lines > 1)
+      vim.api.nvim_set_option('paste', true)  -- For nvim_input().
+      local line1, _ = string.gsub(lines[1], '[\r\n\012\027]', ' ')
+      vim.api.nvim_input(line1)  -- Scrub "\r".
+    elseif mode == 'i' or mode == 'R' then
       vim.api.nvim_put(lines, 'c', false, true)
     else
       vim.api.nvim_put(lines, 'c', true, true)
     end
-    if (now - tredraw >= 1000) or phase == 1 or phase == 3 then
+    if (now - tredraw >= 1000) or phase == -1 or phase > 2 then
       tredraw = now
       vim.api.nvim_command('redraw')
       vim.api.nvim_command('redrawstatus')
     end
-    if (now - tdots >= 100) then
+    if phase ~= -1 and (now - tdots >= 100) then
       local dots = ('.'):rep(tick % 4)
       tdots = now
       tick = tick + 1
@@ -129,8 +126,9 @@ local _paste = (function()
       -- message when there are zero dots.
       vim.api.nvim_command(('echo "%s"'):format(dots))
     end
-    if phase == 3 then
+    if phase == -1 or phase == 3 then
       vim.api.nvim_command('echo ""')
+      vim.api.nvim_set_option('paste', false)
     end
     return true  -- Paste will not continue if not returning `true`.
   end
diff --git a/src/nvim/tui/input.c b/src/nvim/tui/input.c
index 33062e88d3..f9f39c36ff 100644
--- a/src/nvim/tui/input.c
+++ b/src/nvim/tui/input.c
@@ -373,9 +373,9 @@ static bool handle_bracketed_paste(TermInput *input)
       tinput_flush(input, true);
       // Paste phase: "first-chunk".
       input->paste = 1;
-    } else {
+    } else if (input->paste != 0) {
       // Paste phase: "last-chunk".
-      input->paste = 3;
+      input->paste = input->paste == 2 ? 3 : -1;
       tinput_flush(input, true);
       // Paste phase: "disabled".
       input->paste = 0;
diff --git a/src/nvim/tui/input.h b/src/nvim/tui/input.h
index 26a8447eb2..a4071fab40 100644
--- a/src/nvim/tui/input.h
+++ b/src/nvim/tui/input.h
@@ -9,7 +9,8 @@
 
 typedef struct term_input {
   int in_fd;
-  uint8_t paste;  // Phases: 0=disabled 1=first-chunk 2=continue 3=last-chunk
+  // Phases: -1=all 0=disabled 1=first-chunk 2=continue 3=last-chunk
+  int8_t paste;
   bool waiting;
   TermKey *tk;
 #if TERMKEY_VERSION_MAJOR > 0 || TERMKEY_VERSION_MINOR > 18