pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(config): unbind keys correctly (#925)

Browse source 
* turn off the merging of key bindings of layout and configuration
  files for now.

  In certain situations the keybindings would be overwritten.

  Fix #923
This commit is contained in:
a-kenji 2021-12-04 16:06:20 +01:00 • committed by GitHub
parent b727d105f3
commit 050fa8fd07
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
zellij-utils/src/input/config.rs
View file

@ -156,7 +156,8 @@ impl Config {
/// `other` overrides `self`. /// `other` overrides `self`.
pub fn merge(&self, other: Self) -> Self { pub fn merge(&self, other: Self) -> 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), options: self.options.merge(other.options),
themes: self.themes.clone(), // TODO themes: self.themes.clone(), // TODO
plugins: self.plugins.merge(other.plugins), plugins: self.plugins.merge(other.plugins),