···67 return tdefault
68 end
6970- if vim.islist(tdefault) then
71 return toverride
72 end
73 if vim.tbl_isempty(tdefault) then
···93---@param toverride artio.config
94---@return artio.config
95function M.merge(tdefault, toverride)
96- if vim.fn.has("nvim-0.11.0") == 1 then
97- toverride =
98- vim.tbl_deep_extend("keep", toverride, { editor = { float = { solid_border = vim.o.winborder == "solid" } } })
99- end
100- return tmerge(tdefault, toverride)
00101end
102103---@return artio.config
···67 return tdefault
68 end
6970+ if tdefault == vim.NIL or vim.islist(tdefault) then
71 return toverride
72 end
73 if vim.tbl_isempty(tdefault) then
···93---@param toverride artio.config
94---@return artio.config
95function M.merge(tdefault, toverride)
96+ local defaults = vim.deepcopy(tdefault, true)
97+ local mappings = tdefault.mappings
98+ defaults.mappings = vim.NIL
99+ local t = tmerge(defaults, toverride)
100+ t.mappings = toverride.mappings or mappings
101+102+ return t
103end
104105---@return artio.config