diff options
| author | a-kenji <aks.kenji@protonmail.com> | 2021-12-04 16:06:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-04 16:06:20 +0100 |
| commit | 050fa8fd071af20928a1a8547f3ec75b4261c7f2 (patch) | |
| tree | c8b70dbf499771f291394cfd620d1c26a94669b3 /zellij-utils/src | |
| parent | b727d105f330d195487ef83815637942ea7c77ee (diff) | |
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
Diffstat (limited to 'zellij-utils/src')
| -rw-r--r-- | zellij-utils/src/input/config.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/zellij-utils/src/input/config.rs b/zellij-utils/src/input/config.rs index bc2efb860..b38afacd9 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), |