diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-08-31 12:44:42 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2019-09-02 02:27:13 +0200 |
| commit | 976c6667e140fe4dfe2731451b25c4a1309ad165 (patch) | |
| tree | cd472c2334bcffcc83861d1ebbc878ea9efccdb7 /src | |
| parent | 801fe799ff359cdae66ed14f5e0b7c2c4cec9536 (diff) | |
| download | rneovim-976c6667e140fe4dfe2731451b25c4a1309ad165.tar.gz rneovim-976c6667e140fe4dfe2731451b25c4a1309ad165.tar.bz2 rneovim-976c6667e140fe4dfe2731451b25c4a1309ad165.zip | |
paste: one undo-block per stream
- All "chunks" in a paste-stream should form a single undo-block. Side
effect of 7a8579288424 was to create an undo-block for each chunk.
- Also: remove old :redraw force logic, irrelevant after 7a8579288424.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/api/vim.c | 6 | ||||
| -rw-r--r-- | src/nvim/lua/vim.lua | 11 |
2 files changed, 7 insertions, 10 deletions
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c index 21cba96ba7..2034fea770 100644 --- a/src/nvim/api/vim.c +++ b/src/nvim/api/vim.c @@ -1293,11 +1293,11 @@ theend: /// Compare |:put| and |p| which are always linewise. /// /// @param lines |readfile()|-style list of lines. |channel-lines| -/// @param type Edit behavior: -/// - "b" |blockwise-visual| mode +/// @param type Edit behavior: any |getregtype()| result, or: +/// - "b" |blockwise-visual| mode (may include width, e.g. "b3") /// - "c" |characterwise| mode /// - "l" |linewise| mode -/// - "" guess by contents +/// - "" guess by contents, see |setreg()| /// @param after Insert after cursor (like |p|), or before (like |P|). /// @param follow Place cursor at end of inserted text. /// @param[out] err Error details, if any diff --git a/src/nvim/lua/vim.lua b/src/nvim/lua/vim.lua index fd34b8545d..0f2d243524 100644 --- a/src/nvim/lua/vim.lua +++ b/src/nvim/lua/vim.lua @@ -175,13 +175,15 @@ end --@returns false if client should cancel the paste. local function paste(lines, phase) end -- luacheck: no unused paste = (function() - local tdots, tredraw, tick, got_line1 = 0, 0, 0, false + local tdots, tick, got_line1 = 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 < 2 then -- Reset flags. - tdots, tredraw, tick, got_line1 = now, now, 0, false + tdots, tick, got_line1 = now, 0, false + elseif mode ~= 'c' then + vim.api.nvim_command('undojoin') end if mode == 'c' and not got_line1 then -- cmdline-mode: paste only 1 line. got_line1 = (#lines > 1) @@ -193,11 +195,6 @@ paste = (function() else vim.api.nvim_put(lines, 'c', true, true) end - 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 phase ~= -1 and (now - tdots >= 100) then local dots = ('.'):rep(tick % 4) tdots = now |