From 050fa8fd071af20928a1a8547f3ec75b4261c7f2 Mon Sep 17 00:00:00 2001 From: a-kenji Date: Sat, 4 Dec 2021 16:06:20 +0100 Subject: [PATCH] fix(config): unbind keys correctly (#925) * turn off the merging of key bindings of layout and configuration files for now. In certain situations the keybindings would be overwritten. Fix #923 --- zellij-utils/src/input/config.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zellij-utils/src/input/config.rs b/zellij-utils/src/input/config.rs index bc2efb86..b38afacd 100644 --- a/zellij-utils/src/input/config.rs +++ b/zellij-utils/src/input/config.rs @@ -156,7 +156,8 @@ impl Config { /// `other` overrides `self`. pub fn merge(&self, other: Self) -> Self { Self { - keybinds: self.keybinds.merge_keybinds(other.keybinds), + // TODO: merge keybinds in a way that preserves "unbind" attribute + keybinds: self.keybinds.clone(), options: self.options.merge(other.options), themes: self.themes.clone(), // TODO plugins: self.plugins.merge(other.plugins),