From 01fcf869bba850b38e6a45feb389d055e49934b5 Mon Sep 17 00:00:00 2001
From: hrsh7th <hrsh7th@gmail.com>
Date: Thu, 4 Nov 2021 20:49:28 +0900
Subject: [PATCH] Fix expansion bug

---
 lua/cmp/utils/feedkeys.lua | 4 ++--
 lua/cmp/utils/keymap.lua   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lua/cmp/utils/feedkeys.lua b/lua/cmp/utils/feedkeys.lua
index b8e3813..6eabf9f 100644
--- a/lua/cmp/utils/feedkeys.lua
+++ b/lua/cmp/utils/feedkeys.lua
@@ -15,10 +15,10 @@ feedkeys.call = setmetatable({
 
     local queue = {}
     if #keys > 0 then
-      table.insert(queue, { keymap.t('<Cmd>set backspace=start<CR>'), 'n' })
+      table.insert(queue, { keymap.t('<Cmd>set lazyredraw<CR>'), 'n' })
       table.insert(queue, { keymap.t('<Cmd>set eventignore=all<CR>'), 'n' })
       table.insert(queue, { keys, string.gsub(mode, '[it]', ''), true })
-      table.insert(queue, { keymap.t('<Cmd>set backspace=%s<CR>'):format(vim.o.backspace or ''), 'n' })
+      table.insert(queue, { keymap.t('<Cmd>set %slazyredraw<CR>'):format(vim.o.lazyredraw and '' or 'no'), 'n' })
       table.insert(queue, { keymap.t('<Cmd>set eventignore=%s<CR>'):format(vim.o.eventignore or ''), 'n' })
     end
     if #keys > 0 or callback then
diff --git a/lua/cmp/utils/keymap.lua b/lua/cmp/utils/keymap.lua
index 0c641a1..abddd9a 100644
--- a/lua/cmp/utils/keymap.lua
+++ b/lua/cmp/utils/keymap.lua
@@ -69,7 +69,7 @@ keymap.backspace = function(count)
     return ''
   end
   local keys = {}
-  table.insert(keys, keymap.t(string.rep('<BS>', count)))
+  table.insert(keys, keymap.t(string.rep(keymap.undojoin() .. '<Left><Del>', count)))
   return table.concat(keys, '')
 end