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

Fix: missing theme in config (#913)

Browse source 
Signed-off-by: Tw <wei.tan@intel.com>
This commit is contained in:
Tw 2021-11-30 16:46:48 +08:00 • committed by GitHub
parent 485b9e4f98
commit d7e460a3d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -155,11 +155,10 @@ impl Config {
/// Merges two Config structs into one Config struct /// Merges two Config structs into one Config struct
/// `other` overrides `self`. /// `other` overrides `self`.
pub fn merge(&self, other: Self) -> Self { pub fn merge(&self, other: Self) -> Self {
//let themes = if let Some()
Self { Self {
keybinds: self.keybinds.merge_keybinds(other.keybinds), keybinds: self.keybinds.merge_keybinds(other.keybinds),
options: self.options.merge(other.options), options: self.options.merge(other.options),
themes: None, themes: self.themes.clone(), // TODO
plugins: self.plugins.merge(other.plugins), plugins: self.plugins.merge(other.plugins),
} }
} }