Skip to content

Commit

Permalink
fix(config): unbind keys correctly (#925)
Browse files Browse the repository at this point in the history
* turn off the merging of key bindings of layout and configuration
  files for now.

  In certain situations the keybindings would be overwritten.

  Fix #923
  • Loading branch information
a-kenji authored Dec 4, 2021
1 parent b727d10 commit 050fa8f
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion zellij-utils/src/input/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down

0 comments on commit 050fa8f

Please sign in to comment.