From e635452389239d950f791cd36a1a0bda7b0ab34e Mon Sep 17 00:00:00 2001
From: Dalton Kye Miller <36522884+daltonkyemiller@users.noreply.github.com>
Date: Wed, 12 Mar 2025 03:46:10 -0500
Subject: [PATCH] fix: mappings not clearing after diff (#1562)

---
 lua/avante/diff.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lua/avante/diff.lua b/lua/avante/diff.lua
index 85db6a5..4705aef 100644
--- a/lua/avante/diff.lua
+++ b/lua/avante/diff.lua
@@ -374,9 +374,11 @@ end
 ---@param bufnr integer
 function H.clear_buffer_mappings(bufnr)
   if not bufnr or not vim.b[bufnr].avante_conflict_mappings_set then return end
-  for _, mapping in pairs(Config.mappings.diff) do
-    if vim.fn.hasmapto(mapping, "n") > 0 then api.nvim_buf_del_keymap(bufnr, "n", mapping) end
+
+  for _, diff_mapping in pairs(Config.mappings.diff) do
+    pcall(vim.api.nvim_buf_del_keymap, bufnr, "n", diff_mapping)
   end
+
   vim.b[bufnr].avante_conflict_mappings_set = false
   M.restore_timeoutlen(bufnr)
 end